78f1974bc5
Clean up conflicts/provides/depends hell and add PROVIDES for eapol-test variants while at it. Update mesh-DFS patchset from Peter Oh to v5 (with local fixes) which allows to drop two revert-patches for upstream commits which previously were necessary to un-break mesh-DFS support. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
14 lines
430 B
Diff
14 lines
430 B
Diff
--- a/wpa_supplicant/wpa_supplicant.c
|
|
+++ b/wpa_supplicant/wpa_supplicant.c
|
|
@@ -292,9 +292,10 @@ void wpa_supplicant_cancel_auth_timeout(
|
|
*/
|
|
void wpa_supplicant_initiate_eapol(struct wpa_supplicant *wpa_s)
|
|
{
|
|
+ struct wpa_ssid *ssid = wpa_s->current_ssid;
|
|
+
|
|
#ifdef IEEE8021X_EAPOL
|
|
struct eapol_config eapol_conf;
|
|
- struct wpa_ssid *ssid = wpa_s->current_ssid;
|
|
|
|
#ifdef CONFIG_IBSS_RSN
|
|
if (ssid->mode == WPAS_MODE_IBSS &&
|