hostapd: update to 2012-09-10

[openwrt.git] / package / hostapd / patches / 601-wpa_supplicant-add-new-config-params-to-be-used-with.patch

diff --git a/package/hostapd/patches/601-wpa_supplicant-add-new-config-params-to-be-used-with.patch b/package/hostapd/patches/601-wpa_supplicant-add-new-config-params-to-be-used-with.patch
index 447f480..ac0d247 100644 (file)
--- a/package/hostapd/patches/601-wpa_supplicant-add-new-config-params-to-be-used-with.patch
+++ b/package/hostapd/patches/601-wpa_supplicant-add-new-config-params-to-be-used-with.patch
@@ -22,7 +22,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
  #include "common/defs.h"
  
  #define HOSTAPD_CHAN_DISABLED 0x00000001
-@@ -332,6 +333,11 @@ struct wpa_driver_associate_params {
+@@ -351,6 +352,11 @@ struct wpa_driver_associate_params {
         */
        int freq;
  
@@ -44,7 +44,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
  #include "config.h"
  
  
-@@ -1431,6 +1432,97 @@ static char * wpa_config_write_p2p_clien
+@@ -1463,6 +1464,97 @@ static char * wpa_config_write_p2p_clien
  
  #endif /* CONFIG_P2P */
  
@@ -142,10 +142,10 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
  /* Helper macros for network block parser */
  
  #ifdef OFFSET
-@@ -1605,6 +1697,10 @@ static const struct parse_data ssid_fiel
-       { STR(ht_mcs) },
+@@ -1638,6 +1730,10 @@ static const struct parse_data ssid_fiel
  #endif /* CONFIG_HT_OVERRIDES */
        { INT(ap_max_inactivity) },
+       { INT(dtim_period) },
 +      { INT_RANGE(fixed_freq, 0, 1) },
 +      { INT_RANGE(beacon_interval, 0, 1000) },
 +      { FUNC(rates) },
@@ -163,10 +163,10 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
  
  #define MAX_SSID_LEN 32
  
-@@ -499,6 +500,11 @@ struct wpa_ssid {
-        * By default: 300 seconds.
+@@ -529,6 +530,11 @@ struct wpa_ssid {
+        * disabled_until - Network block disabled until this time if non-zero
         */
-       int ap_max_inactivity;
+       struct os_time disabled_until;
 +
 +      int fixed_freq;
 +      int beacon_interval;
@@ -177,7 +177,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
  #endif /* CONFIG_SSID_H */
 --- a/wpa_supplicant/wpa_supplicant.c
 +++ b/wpa_supplicant/wpa_supplicant.c
-@@ -1395,15 +1395,24 @@ void wpa_supplicant_associate(struct wpa
+@@ -1561,15 +1561,24 @@ void wpa_supplicant_associate(struct wpa
                params.ssid_len = ssid->ssid_len;
        }