hostapd: update to version 2018-12-02 (2.7)

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

diff --git a/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch b/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
index c6053f095338125fdad1a766ef2d2d9ee4ba04c2..1bb5d6e620b7273bd72f488876802c6be7f5c768 100644 (file)
--- a/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
+++ b/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
@@ -21,8 +21,8 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
 +#include "ap/sta_info.h"
  #include "common/defs.h"
  #include "common/ieee802_11_defs.h"
 +#include "ap/sta_info.h"
  #include "common/defs.h"
  #include "common/ieee802_11_defs.h"

- #include "utils/list.h"
-@@ -587,6 +588,9 @@ struct wpa_driver_associate_params {
+ #include "common/wpa_common.h"
+@@ -774,6 +775,9 @@ struct wpa_driver_associate_params {

         * responsible for selecting with which BSS to associate. */
        const u8 *bssid;
  
         * responsible for selecting with which BSS to associate. */
        const u8 *bssid;
  


@@ -34,7 +34,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
         *
 --- a/wpa_supplicant/config.c
 +++ b/wpa_supplicant/config.c
         *
 --- a/wpa_supplicant/config.c
 +++ b/wpa_supplicant/config.c

-@@ -16,6 +16,7 @@
+@@ -17,6 +17,7 @@

  #include "eap_peer/eap.h"
  #include "p2p/p2p.h"
  #include "fst/fst.h"
  #include "eap_peer/eap.h"
  #include "p2p/p2p.h"
  #include "fst/fst.h"


@@ -42,8 +42,8 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
  #include "config.h"
  
  
  #include "config.h"
  
  

-@@ -1816,6 +1817,97 @@ static char * wpa_config_write_mesh_basi
- #endif /* CONFIG_MESH */
+@@ -2053,6 +2054,97 @@ static char * wpa_config_write_peerkey(c
+ #endif /* NO_CONFIG_WRITE */

  
  
 +static int wpa_config_parse_mcast_rate(const struct parse_data *data,
  
  
 +static int wpa_config_parse_mcast_rate(const struct parse_data *data,


@@ -140,16 +140,15 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
  /* Helper macros for network block parser */
  
  #ifdef OFFSET
  /* Helper macros for network block parser */
  
  #ifdef OFFSET

-@@ -2048,6 +2140,9 @@ static const struct parse_data ssid_fiel
+@@ -2298,6 +2390,8 @@ static const struct parse_data ssid_fiel

        { INT(ap_max_inactivity) },
        { INT(dtim_period) },
        { INT(beacon_int) },
        { INT(ap_max_inactivity) },
        { INT(dtim_period) },
        { INT(beacon_int) },

-+      { INT_RANGE(fixed_freq, 0, 1) },

 +      { FUNC(rates) },
 +      { FUNC(mcast_rate) },
  #ifdef CONFIG_MACSEC
        { INT_RANGE(macsec_policy, 0, 1) },
 +      { FUNC(rates) },
 +      { FUNC(mcast_rate) },
  #ifdef CONFIG_MACSEC
        { INT_RANGE(macsec_policy, 0, 1) },

- #endif /* CONFIG_MACSEC */
+       { INT_RANGE(macsec_integ_only, 0, 1) },

 --- a/wpa_supplicant/config_ssid.h
 +++ b/wpa_supplicant/config_ssid.h
 @@ -10,8 +10,10 @@
 --- a/wpa_supplicant/config_ssid.h
 +++ b/wpa_supplicant/config_ssid.h
 @@ -10,8 +10,10 @@


@@ -163,7 +162,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
  
  
  #define DEFAULT_EAP_WORKAROUND ((unsigned int) -1)
  
  
  #define DEFAULT_EAP_WORKAROUND ((unsigned int) -1)

-@@ -719,6 +721,9 @@ struct wpa_ssid {
+@@ -757,6 +759,9 @@ struct wpa_ssid {

         */
        void *parent_cred;
  
         */
        void *parent_cred;
  


@@ -175,11 +174,10 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
         * macsec_policy - Determines the policy for MACsec secure session
 --- a/wpa_supplicant/wpa_supplicant.c
 +++ b/wpa_supplicant/wpa_supplicant.c
         * macsec_policy - Determines the policy for MACsec secure session
 --- a/wpa_supplicant/wpa_supplicant.c
 +++ b/wpa_supplicant/wpa_supplicant.c

-@@ -2527,6 +2527,13 @@ static void wpas_start_assoc_cb(struct w
+@@ -3117,6 +3117,12 @@ static void wpas_start_assoc_cb(struct w

                        params.beacon_int = ssid->beacon_int;
                else
                        params.beacon_int = wpa_s->conf->beacon_int;
                        params.beacon_int = ssid->beacon_int;
                else
                        params.beacon_int = wpa_s->conf->beacon_int;

-+              params.fixed_freq = ssid->fixed_freq;

 +              i = 0;
 +              while (i < WLAN_SUPP_RATES_MAX) {
 +                      params.rates[i] = ssid->rates[i];
 +              i = 0;
 +              while (i < WLAN_SUPP_RATES_MAX) {
 +                      params.rates[i] = ssid->rates[i];


@@ -188,4 +186,4 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
 +              params.mcast_rate = ssid->mcast_rate;
        }
  
 +              params.mcast_rate = ssid->mcast_rate;
        }
  

-       params.wpa_ie = wpa_ie;
+       params.pairwise_suite = cipher_pairwise;