hostapd: update to 2014-10-25

[openwrt/staging/yousong.git] / 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 4ea26b6c72f7357a23bd7e6e99216c7b5c6ec131..9910f89b7ba8d9e8515e14a0416f63d3b5ac4ba0 100644 (file)
--- 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;
@@ -30,3 +30,25 @@
                return 0; /* HT40 not used */
  
        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
+       if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET))
+               return;
+ 
++      if (iface->conf->noscan)
++              return;
++
+       if (len < IEEE80211_HDRLEN + 1)
+               return;
+       data++;
+@@ -317,6 +320,9 @@ void ht40_intolerant_add(struct hostapd_
+       if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
+               return;
+ 
++      if (iface->conf->noscan)
++              return;
++
+       wpa_printf(MSG_INFO, "HT: Forty MHz Intolerant is set by STA " MACSTR
+                  " in Association Request", MAC2STR(sta->addr));
+