OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 20... Line 20...
20 20
21 +#include "ap/sta_info.h" 21 +#include "ap/sta_info.h"
22 #include "common/defs.h" 22 #include "common/defs.h"
23 #include "common/ieee802_11_defs.h" 23 #include "common/ieee802_11_defs.h"
24 #include "common/wpa_common.h" 24 #include "common/wpa_common.h"
25 @@ -774,6 +775,9 @@ struct wpa_driver_associate_params { 25 @@ -762,6 +763,9 @@ struct wpa_driver_associate_params {
26 * responsible for selecting with which BSS to associate. */ 26 * responsible for selecting with which BSS to associate. */
Line 27... Line 27...
27 const u8 *bssid; 27 const u8 *bssid;
28 28
Line 40... Line 40...
40 #include "fst/fst.h" 40 #include "fst/fst.h"
41 +#include "ap/sta_info.h" 41 +#include "ap/sta_info.h"
42 #include "config.h" 42 #include "config.h"
Line 43... Line 43...
43 43
44 44
Line 45... Line 45...
45 @@ -2053,6 +2054,97 @@ static char * wpa_config_write_peerkey(c 45 @@ -2037,6 +2038,97 @@ static char * wpa_config_write_peerkey(c
46 #endif /* NO_CONFIG_WRITE */ 46 #endif /* NO_CONFIG_WRITE */
Line 138... Line 138...
138 +#endif /* NO_CONFIG_WRITE */ 138 +#endif /* NO_CONFIG_WRITE */
139 + 139 +
140 /* Helper macros for network block parser */ 140 /* Helper macros for network block parser */
Line 141... Line 141...
141 141
142 #ifdef OFFSET 142 #ifdef OFFSET
143 @@ -2298,6 +2390,8 @@ static const struct parse_data ssid_fiel 143 @@ -2281,6 +2373,8 @@ static const struct parse_data ssid_fiel
144 { INT(ap_max_inactivity) }, 144 { INT(ap_max_inactivity) },
145 { INT(dtim_period) }, 145 { INT(dtim_period) },
146 { INT(beacon_int) }, 146 { INT(beacon_int) },
147 + { FUNC(rates) }, 147 + { FUNC(rates) },
Line 160... Line 160...
160 #include "eap_peer/eap_config.h" 160 #include "eap_peer/eap_config.h"
161 +#include "drivers/nl80211_copy.h" 161 +#include "drivers/nl80211_copy.h"
Line 162... Line 162...
162 162
163 163
164 #define DEFAULT_EAP_WORKAROUND ((unsigned int) -1) 164 #define DEFAULT_EAP_WORKAROUND ((unsigned int) -1)
165 @@ -757,6 +759,9 @@ struct wpa_ssid { 165 @@ -749,6 +751,9 @@ struct wpa_ssid {
Line 166... Line 166...
166 */ 166 */
167 void *parent_cred; 167 void *parent_cred;
Line 172... Line 172...
172 #ifdef CONFIG_MACSEC 172 #ifdef CONFIG_MACSEC
173 /** 173 /**
174 * macsec_policy - Determines the policy for MACsec secure session 174 * macsec_policy - Determines the policy for MACsec secure session
175 --- a/wpa_supplicant/wpa_supplicant.c 175 --- a/wpa_supplicant/wpa_supplicant.c
176 +++ b/wpa_supplicant/wpa_supplicant.c 176 +++ b/wpa_supplicant/wpa_supplicant.c
177 @@ -3117,6 +3117,12 @@ static void wpas_start_assoc_cb(struct w 177 @@ -3000,6 +3000,12 @@ static void wpas_start_assoc_cb(struct w
178 params.beacon_int = ssid->beacon_int; 178 params.beacon_int = ssid->beacon_int;
179 else 179 else
180 params.beacon_int = wpa_s->conf->beacon_int; 180 params.beacon_int = wpa_s->conf->beacon_int;
181 + i = 0; 181 + i = 0;
182 + while (i < WLAN_SUPP_RATES_MAX) { 182 + while (i < WLAN_SUPP_RATES_MAX) {