aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-11-21 20:27:06 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-11-21 20:27:06 +0000
commitf1498531c78466ab07c1c2b1cc788f2689e9b18e (patch)
tree93f8d8ca2f88de7b071fc9dd2577b3beed7f0e08
parent7453b0dd8ec45a68dd3cd3ce0c37a3f5a4aa59d0 (diff)
downloadupstream-f1498531c78466ab07c1c2b1cc788f2689e9b18e.tar.gz
upstream-f1498531c78466ab07c1c2b1cc788f2689e9b18e.tar.bz2
upstream-f1498531c78466ab07c1c2b1cc788f2689e9b18e.zip
hostapd: include sys/stat.h for a struct stat definition
Some libcs need this header to be explicitely included (e.g: musl) Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 34295
-rw-r--r--package/network/services/hostapd/patches/100-pending_work.patch2
-rw-r--r--package/network/services/hostapd/patches/500-random_pool_add_kernel.patch24
-rw-r--r--package/network/services/hostapd/patches/550-limit_debug_messages.patch2
-rw-r--r--package/network/services/hostapd/patches/580-fix_bss_addr.patch2
4 files changed, 19 insertions, 11 deletions
diff --git a/package/network/services/hostapd/patches/100-pending_work.patch b/package/network/services/hostapd/patches/100-pending_work.patch
index 73949dd386..b7c77283e7 100644
--- a/package/network/services/hostapd/patches/100-pending_work.patch
+++ b/package/network/services/hostapd/patches/100-pending_work.patch
@@ -83,7 +83,7 @@
pos[1] = 0;
pos += 2;
}
-@@ -7698,6 +7698,10 @@ static int i802_set_wds_sta(void *priv,
+@@ -7698,6 +7698,10 @@ static int i802_set_wds_sta(void *priv,
}
return i802_set_sta_vlan(priv, addr, name, 0);
} else {
diff --git a/package/network/services/hostapd/patches/500-random_pool_add_kernel.patch b/package/network/services/hostapd/patches/500-random_pool_add_kernel.patch
index e54e881d8e..55b8f716e5 100644
--- a/package/network/services/hostapd/patches/500-random_pool_add_kernel.patch
+++ b/package/network/services/hostapd/patches/500-random_pool_add_kernel.patch
@@ -1,6 +1,14 @@
--- a/src/crypto/random.c
+++ b/src/crypto/random.c
-@@ -33,6 +33,8 @@
+@@ -25,6 +25,7 @@
+ #include "utils/includes.h"
+ #ifdef __linux__
+ #include <fcntl.h>
++#include <sys/stat.h>
+ #endif /* __linux__ */
+
+ #include "utils/common.h"
+@@ -33,6 +34,8 @@
#include "sha1.h"
#include "random.h"
@@ -9,7 +17,7 @@
#define POOL_WORDS 32
#define POOL_WORDS_MASK (POOL_WORDS - 1)
#define POOL_TAP1 26
-@@ -43,6 +45,8 @@
+@@ -43,6 +46,8 @@
#define EXTRACT_LEN 16
#define MIN_READY_MARK 2
@@ -18,7 +26,7 @@
static u32 pool[POOL_WORDS];
static unsigned int input_rotate = 0;
static unsigned int pool_pos = 0;
-@@ -123,7 +127,7 @@ static void random_extract(u8 *out)
+@@ -123,7 +128,7 @@ static void random_extract(u8 *out)
}
@@ -27,7 +35,7 @@
{
struct os_time t;
static unsigned int count = 0;
-@@ -213,16 +217,22 @@ int random_get_bytes(void *buf, size_t l
+@@ -213,16 +218,22 @@ int random_get_bytes(void *buf, size_t l
int random_pool_ready(void)
{
#ifdef __linux__
@@ -51,7 +59,7 @@
/*
* Try to fetch some more data from the kernel high quality
-@@ -257,6 +267,7 @@ int random_pool_ready(void)
+@@ -257,6 +268,7 @@ int random_pool_ready(void)
if (dummy_key_avail == sizeof(dummy_key)) {
if (own_pool_ready < MIN_READY_MARK)
own_pool_ready = MIN_READY_MARK;
@@ -59,7 +67,7 @@
random_write_entropy();
return 1;
}
-@@ -269,6 +280,7 @@ int random_pool_ready(void)
+@@ -269,6 +281,7 @@ int random_pool_ready(void)
total_collected + 10 * own_pool_ready > MIN_COLLECT_ENTROPY) {
wpa_printf(MSG_INFO, "random: Allow operation to proceed "
"based on internal entropy");
@@ -67,7 +75,7 @@
return 1;
}
-@@ -284,10 +296,16 @@ int random_pool_ready(void)
+@@ -284,10 +297,16 @@ int random_pool_ready(void)
void random_mark_pool_ready(void)
{
@@ -84,7 +92,7 @@
}
-@@ -444,3 +462,22 @@ void random_deinit(void)
+@@ -444,3 +463,22 @@ void random_deinit(void)
os_free(random_entropy_file);
random_entropy_file = NULL;
}
diff --git a/package/network/services/hostapd/patches/550-limit_debug_messages.patch b/package/network/services/hostapd/patches/550-limit_debug_messages.patch
index 659e980112..ba38d3cf93 100644
--- a/package/network/services/hostapd/patches/550-limit_debug_messages.patch
+++ b/package/network/services/hostapd/patches/550-limit_debug_messages.patch
@@ -165,7 +165,7 @@
/**
* wpa_hexdump_ascii_key - conditional hex dump, hide keys
-@@ -138,8 +173,14 @@ void wpa_hexdump_ascii(int level, const
+@@ -138,8 +173,14 @@ void wpa_hexdump_ascii(int level, const
* bytes per line will be shown. This works like wpa_hexdump_ascii(), but by
* default, does not include secret keys (passwords, etc.) in debug output.
*/
diff --git a/package/network/services/hostapd/patches/580-fix_bss_addr.patch b/package/network/services/hostapd/patches/580-fix_bss_addr.patch
index 3a76668c14..9ee6af0d89 100644
--- a/package/network/services/hostapd/patches/580-fix_bss_addr.patch
+++ b/package/network/services/hostapd/patches/580-fix_bss_addr.patch
@@ -1,6 +1,6 @@
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
-@@ -7738,7 +7738,7 @@ static int i802_set_wds_sta(void *priv,
+@@ -7738,7 +7738,7 @@ static int i802_set_wds_sta(void *priv,
if (!if_nametoindex(name)) {
if (nl80211_create_iface(drv, name,
NL80211_IFTYPE_AP_VLAN,
href='#n416'>416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460