WPS: Use WEP key index 1..4 instead of 0..3 when configuring AP

[wpasupplicant] / hostapd / wme.c

diff --git a/hostapd/wme.c b/hostapd/wme.c
index ae2357e..f991f86 100644 (file)
--- a/hostapd/wme.c
+++ b/hostapd/wme.c
@@ -19,7 +19,7 @@
 #include "ieee802_11.h"
 #include "wme.h"
 #include "sta_info.h"
-#include "driver.h"
+#include "driver_i.h"
 
 
 /* TODO: maintain separate sequence and fragment numbers for each AC
@@ -141,7 +141,7 @@ static void wme_send_action(struct hostapd_data *hapd, const u8 *addr,
        os_memcpy(m->da, addr, ETH_ALEN);
        os_memcpy(m->sa, hapd->own_addr, ETH_ALEN);
        os_memcpy(m->bssid, hapd->own_addr, ETH_ALEN);
-       m->u.action.category = WME_ACTION_CATEGORY;
+       m->u.action.category = WLAN_ACTION_WMM;
        m->u.action.u.wme_action.action_code = action_code;
        m->u.action.u.wme_action.dialog_token = dialogue_token;
        m->u.action.u.wme_action.status_code = status_code;
@@ -212,8 +212,7 @@ void hostapd_wme_action(struct hostapd_data *hapd, struct ieee80211_mgmt *mgmt,
        }
 
        /* extract the tspec info element */
-       if (ieee802_11_parse_elems(hapd, pos, left, &elems, 1) == ParseFailed)
-       {
+       if (ieee802_11_parse_elems(pos, left, &elems, 1) == ParseFailed) {
                hostapd_logger(hapd, mgmt->sa, HOSTAPD_MODULE_IEEE80211,
                               HOSTAPD_LEVEL_DEBUG,
                               "hostapd_wme_action - could not parse wme "