diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-03-26 23:33:47 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-26 23:33:47 +0000 |
commit | 0be32368ad57192f5b92c96f61021b6d8752469e (patch) | |
tree | ee4cc1f042906b1a41b1102091ca342dab62a191 /package/network/services/hostapd/patches/300-noscan.patch | |
parent | d82b57a74f46f61ae387a344926100d61ec72d93 (diff) | |
download | master-187ad058-0be32368ad57192f5b92c96f61021b6d8752469e.tar.gz master-187ad058-0be32368ad57192f5b92c96f61021b6d8752469e.tar.bz2 master-187ad058-0be32368ad57192f5b92c96f61021b6d8752469e.zip |
hostapd: update hostapd to 2015-03-25
madwifi was dropped upstream, can't find it anywhere in OpenWrt
either, thus finally burrying madwifi.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45045 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/hostapd/patches/300-noscan.patch')
-rw-r--r-- | package/network/services/hostapd/patches/300-noscan.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/network/services/hostapd/patches/300-noscan.patch b/package/network/services/hostapd/patches/300-noscan.patch index 9910f89b7b..5b30abcc60 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 -@@ -2651,6 +2651,8 @@ static int hostapd_config_fill(struct ho +@@ -2771,6 +2771,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 -@@ -605,6 +605,7 @@ struct hostapd_config { +@@ -619,6 +619,7 @@ struct hostapd_config { int ht_op_mode_fixed; u16 ht_capab; @@ -21,7 +21,7 @@ int require_ht; --- a/src/ap/hw_features.c +++ b/src/ap/hw_features.c -@@ -690,7 +690,7 @@ static int ieee80211n_check_40mhz(struct +@@ -461,7 +461,7 @@ static int ieee80211n_check_40mhz(struct struct wpa_driver_scan_params params; int ret; @@ -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 -@@ -220,6 +220,9 @@ void hostapd_2040_coex_action(struct hos +@@ -221,6 +221,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; + - if (len < IEEE80211_HDRLEN + 1) + if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) return; - data++; -@@ -317,6 +320,9 @@ void ht40_intolerant_add(struct hostapd_ + +@@ -346,6 +349,9 @@ void ht40_intolerant_add(struct hostapd_ if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G) return; |