X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fnetwork%2Fservices%2Fhostapd%2Fpatches%2F500-wpa_supplicant-add-new-config-params-to-be-used-with.patch;h=74793ef3e180e837fc33960d73cbb6661fbc9a6f;hb=80c2c42088d8c3a21bb59729e9b8f1497bdc1f7d;hp=56569702a974245bd0f1a821757cabb6809fd5cf;hpb=f6769b636fe385ce4d9e673926e304b1aea2856d;p=openwrt.git

diff --git a/package/network/services/hostapd/patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch b/package/network/services/hostapd/patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch
index 56569702a9..74793ef3e1 100644
--- a/package/network/services/hostapd/patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch
+++ b/package/network/services/hostapd/patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch
@@ -149,9 +149,9 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
 +	{ INT_RANGE(fixed_freq, 0, 1) },
 +	{ FUNC(rates) },
 +	{ FUNC(mcast_rate) },
- };
- 
- #undef OFFSET
+ #ifdef CONFIG_MACSEC
+ 	{ INT_RANGE(macsec_policy, 0, 1) },
+ #endif /* CONFIG_MACSEC */
 --- a/wpa_supplicant/config_ssid.h
 +++ b/wpa_supplicant/config_ssid.h
 @@ -12,6 +12,7 @@
@@ -162,20 +162,20 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
  
  #define MAX_SSID_LEN 32
  
-@@ -636,6 +637,10 @@ struct wpa_ssid {
- 	 * dereferences since it may not be updated in all cases.
+@@ -637,6 +638,10 @@ struct wpa_ssid {
  	 */
  	void *parent_cred;
-+
+ 
 +	int fixed_freq;
 +	unsigned char rates[NL80211_MAX_SUPP_RATES];
 +	double mcast_rate;
- };
- 
- #endif /* CONFIG_SSID_H */
++
+ #ifdef CONFIG_MACSEC
+ 	/**
+ 	 * macsec_policy - Determines the policy for MACsec secure session
 --- a/wpa_supplicant/wpa_supplicant.c
 +++ b/wpa_supplicant/wpa_supplicant.c
-@@ -1791,6 +1791,13 @@ static void wpas_start_assoc_cb(struct w
+@@ -1805,6 +1805,13 @@ static void wpas_start_assoc_cb(struct w
  			params.beacon_int = ssid->beacon_int;
  		else
  			params.beacon_int = wpa_s->conf->beacon_int;