wpa_supplicant: Fix type for ssid->mode comparisons

The ssid->mode is from type enum wpas_mode and all its constants start
with WPAS_MODE_*. Still some of the code sections used the
IEEE80211_MODE_* defines instead of WPAS_MODE_*.

This should have no impact on the actual code because the constants for
INFRA, IBSS, AP and MESH had the same values.

Signed-off-by: Sven Eckelmann <seckelmann@datto.com>

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index ae2fc632491fd558f444aa99f11f8380e3a866b5..255562173d8e1c3a257d0d7ab7bd94bba4490f45 100644 (file)
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1222,7 +1222,7 @@ struct wpa_ssid * wpa_scan_res_match(struct wpa_supplicant *wpa_s,
                        continue;
                }
 
-               if (ssid->mode != IEEE80211_MODE_MESH && !bss_is_ess(bss) &&
+               if (ssid->mode != WPAS_MODE_MESH && !bss_is_ess(bss) &&
                    !bss_is_pbss(bss)) {
                        if (debug_print)
                                wpa_dbg(wpa_s, MSG_DEBUG,
@@ -1246,7 +1246,7 @@ struct wpa_ssid * wpa_scan_res_match(struct wpa_supplicant *wpa_s,
                }
 
 #ifdef CONFIG_MESH
-               if (ssid->mode == IEEE80211_MODE_MESH && ssid->frequency > 0 &&
+               if (ssid->mode == WPAS_MODE_MESH && ssid->frequency > 0 &&
                    ssid->frequency != bss->freq) {
                        if (debug_print)
                                wpa_dbg(wpa_s, MSG_DEBUG,
@@ -1615,9 +1615,9 @@ wpa_supplicant_pick_new_network(struct wpa_supplicant *wpa_s)
                                continue;
                        }
 #endif /* !CONFIG_IBSS_RSN */
-                       if (ssid->mode == IEEE80211_MODE_IBSS ||
-                           ssid->mode == IEEE80211_MODE_AP ||
-                           ssid->mode == IEEE80211_MODE_MESH)
+                       if (ssid->mode == WPAS_MODE_IBSS ||
+                           ssid->mode == WPAS_MODE_AP ||
+                           ssid->mode == WPAS_MODE_MESH)
                                return ssid;
                }
        }
@@ -2839,7 +2839,7 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
        if (wpa_s->key_mgmt == WPA_KEY_MGMT_NONE ||
            wpa_s->key_mgmt == WPA_KEY_MGMT_WPA_NONE ||
            (wpa_s->current_ssid &&
-            wpa_s->current_ssid->mode == IEEE80211_MODE_IBSS)) {
+            wpa_s->current_ssid->mode == WPAS_MODE_IBSS)) {
                if (wpa_s->current_ssid &&
                    wpa_s->key_mgmt == WPA_KEY_MGMT_WPA_NONE &&
                    (wpa_s->drv_flags &

diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c
index ded40874b066be7809bc3af03889d3d864dd66ed..dd5020179f3bb54ab9739b1b5e4a9006412a92dc 100644 (file)
--- a/wpa_supplicant/sme.c
+++ b/wpa_supplicant/sme.c
@@ -2246,7 +2246,7 @@ void sme_sched_obss_scan(struct wpa_supplicant *wpa_s, int enable)
         */
        if (!((wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME) ||
              (wpa_s->drv_flags & WPA_DRIVER_FLAGS_OBSS_SCAN)) ||
-           ssid == NULL || ssid->mode != IEEE80211_MODE_INFRA)
+           ssid == NULL || ssid->mode != WPAS_MODE_INFRA)
                return;
 
        if (!wpa_s->hw.modes)

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 2002b129fc32a93221062a5d3864fafffdb178db..1e11234741e7388c47597e5c828a2cb2f4cca1ca 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -2066,7 +2066,7 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s,
 #endif /* CONFIG_TDLS */
 
        if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME) &&
-           ssid->mode == IEEE80211_MODE_INFRA) {
+           ssid->mode == WPAS_MODE_INFRA) {
                sme_authenticate(wpa_s, bss, ssid);
                return;
        }
@@ -4232,7 +4232,7 @@ void wpa_supplicant_rx_eapol(void *ctx, const u8 *src_addr,
             !wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt) ||
             wpa_s->wpa_state != WPA_COMPLETED) &&
            (wpa_s->current_ssid == NULL ||
-            wpa_s->current_ssid->mode != IEEE80211_MODE_IBSS)) {
+            wpa_s->current_ssid->mode != WPAS_MODE_IBSS)) {
                /* Timeout for completing IEEE 802.1X and WPA authentication */
                int timeout = 10;