From 924407b253fdf22ab27e72ae38b4d9513d0191c8 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 28 Jan 2016 17:19:13 +0000 Subject: hostapd: update to version 2016-01-15 Signed-off-by: Felix Fietkau SVN-Revision: 48527 --- .../services/hostapd/patches/300-noscan.patch | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'package/network/services/hostapd/patches/300-noscan.patch') diff --git a/package/network/services/hostapd/patches/300-noscan.patch b/package/network/services/hostapd/patches/300-noscan.patch index 57d8fe2..85dc0c1 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 -@@ -2771,6 +2771,10 @@ static int hostapd_config_fill(struct ho +@@ -2852,6 +2852,10 @@ static int hostapd_config_fill(struct ho } #endif /* CONFIG_IEEE80211W */ #ifdef CONFIG_IEEE80211N @@ -13,7 +13,7 @@ } else if (os_strcmp(buf, "ht_capab") == 0) { --- a/src/ap/ap_config.h +++ b/src/ap/ap_config.h -@@ -619,6 +619,8 @@ struct hostapd_config { +@@ -639,6 +639,8 @@ struct hostapd_config { int ht_op_mode_fixed; u16 ht_capab; @@ -21,21 +21,22 @@ + int no_ht_coex; int ieee80211n; int secondary_channel; - int require_ht; + int no_pri_sec_switch; --- a/src/ap/hw_features.c +++ b/src/ap/hw_features.c -@@ -461,7 +461,7 @@ static int ieee80211n_check_40mhz(struct - struct wpa_driver_scan_params params; +@@ -473,7 +473,8 @@ static int ieee80211n_check_40mhz(struct int ret; -- if (!iface->conf->secondary_channel) -+ if (!iface->conf->secondary_channel || iface->conf->noscan) - return 0; /* HT40 not used */ + /* Check that HT40 is used and PRI / SEC switch is allowed */ +- if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch) ++ if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch || ++ iface->conf->noscan) + return 0; 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 +@@ -244,6 +244,9 @@ void hostapd_2040_coex_action(struct hos if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET)) return; @@ -45,7 +46,7 @@ if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) return; -@@ -346,6 +349,9 @@ void ht40_intolerant_add(struct hostapd_ +@@ -368,6 +371,9 @@ void ht40_intolerant_add(struct hostapd_ if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G) return; -- cgit v1.1