+#include "ap/sta_info.h"
#include "common/defs.h"
#include "common/ieee802_11_defs.h"
- #ifdef CONFIG_MACSEC
-@@ -605,6 +606,9 @@ struct wpa_driver_associate_params {
+ #include "common/wpa_common.h"
+@@ -762,6 +763,9 @@ struct wpa_driver_associate_params {
* responsible for selecting with which BSS to associate. */
const u8 *bssid;
*
--- 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 "config.h"
-@@ -1891,6 +1892,97 @@ static char * wpa_config_write_mka_ckn(c
+@@ -1985,6 +1986,97 @@ static char * wpa_config_write_mka_ckn(c
#endif /* CONFIG_MACSEC */
/* Helper macros for network block parser */
#ifdef OFFSET
-@@ -2123,6 +2215,9 @@ static const struct parse_data ssid_fiel
+@@ -2224,6 +2316,9 @@ static const struct parse_data ssid_fiel
{ INT(ap_max_inactivity) },
{ INT(dtim_period) },
{ INT(beacon_int) },
#define DEFAULT_EAP_WORKAROUND ((unsigned int) -1)
-@@ -719,6 +721,9 @@ struct wpa_ssid {
+@@ -735,6 +737,9 @@ struct wpa_ssid {
*/
void *parent_cred;
* macsec_policy - Determines the policy for MACsec secure session
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -2561,6 +2561,13 @@ static void wpas_start_assoc_cb(struct w
+@@ -2781,6 +2781,13 @@ static void wpas_start_assoc_cb(struct w
params.beacon_int = ssid->beacon_int;
else
params.beacon_int = wpa_s->conf->beacon_int;