diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-10-25 16:48:45 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-10-25 16:48:45 +0000 |
| commit | 3c9fcd2526e8a25a618851453ceb6a63e83c53b3 (patch) | |
| tree | b62342b3ba0a466b7104ec1e2d76352c122223f2 /package/network/services/hostapd/patches/300-noscan.patch | |
| parent | 78bd998e49120d309ddfce88de4b2df42bee2646 (diff) | |
| download | upstream-3c9fcd2526e8a25a618851453ceb6a63e83c53b3.tar.gz upstream-3c9fcd2526e8a25a618851453ceb6a63e83c53b3.tar.bz2 upstream-3c9fcd2526e8a25a618851453ceb6a63e83c53b3.zip | |
hostapd: update to 2014-10-25
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43059
Diffstat (limited to 'package/network/services/hostapd/patches/300-noscan.patch')
| -rw-r--r-- | package/network/services/hostapd/patches/300-noscan.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/network/services/hostapd/patches/300-noscan.patch b/package/network/services/hostapd/patches/300-noscan.patch index ac296b8e38..9910f89b7b 100644 --- a/package/network/services/hostapd/patches/300-noscan.patch +++ b/package/network/services/hostapd/patches/300-noscan.patch @@ -1,6 +1,6 @@ --- a/hostapd/config_file.c +++ b/hostapd/config_file.c -@@ -2639,6 +2639,8 @@ static int hostapd_config_fill(struct ho +@@ -2651,6 +2651,8 @@ static int hostapd_config_fill(struct ho } #endif /* CONFIG_IEEE80211W */ #ifdef CONFIG_IEEE80211N @@ -11,7 +11,7 @@ } else if (os_strcmp(buf, "ht_capab") == 0) { --- a/src/ap/ap_config.h +++ b/src/ap/ap_config.h -@@ -576,6 +576,7 @@ struct hostapd_config { +@@ -605,6 +605,7 @@ struct hostapd_config { int ht_op_mode_fixed; u16 ht_capab; @@ -32,17 +32,17 @@ hostapd_set_state(iface, HAPD_IFACE_HT_SCAN); --- a/src/ap/ieee802_11_ht.c +++ b/src/ap/ieee802_11_ht.c -@@ -221,6 +221,9 @@ void hostapd_2040_coex_action(struct hos +@@ -220,6 +220,9 @@ void hostapd_2040_coex_action(struct hos if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET)) return; + if (iface->conf->noscan) + return; + - hdr_len = data - (u8 *) mgmt; - if (hdr_len > len) + if (len < IEEE80211_HDRLEN + 1) return; -@@ -319,6 +322,9 @@ void ht40_intolerant_add(struct hostapd_ + data++; +@@ -317,6 +320,9 @@ void ht40_intolerant_add(struct hostapd_ if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G) return; |