Remove unneeded hostapd_wmm_sta_config()

The WMM STA flag is already taken care of by handle_assoc_cb() and there
is no point trying to do this unless hostapd is taking care MLME
processing, so no need to call this from drv_callbacks.c.

diff --git a/hostapd/drv_callbacks.c b/hostapd/drv_callbacks.c
index db6b19f4b07107833df2eca2805fab571cacd57e..de5e3794a1e8f2dbe1c2713e881dd326d491ab65 100644 (file)
--- a/hostapd/drv_callbacks.c
+++ b/hostapd/drv_callbacks.c
@@ -106,8 +106,6 @@ void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
        if (!hapd->conf->ieee802_1x && !hapd->conf->wpa)
                accounting_sta_start(hapd, sta);
 
-       hostapd_wmm_sta_config(hapd, sta);
-
        /* Start IEEE 802.1X authentication process for new stations */
        ieee802_1x_new_station(hapd, sta);
        if (reassoc) {

diff --git a/hostapd/wme.c b/hostapd/wme.c
index 660e141ac2431f714809b61285187579f0b49be1..818ded72a53b6e450440644973d551a1c865e475 100644 (file)
--- a/hostapd/wme.c
+++ b/hostapd/wme.c
@@ -119,23 +119,6 @@ int hostapd_eid_wmm_valid(struct hostapd_data *hapd, const u8 *eid, size_t len)
 }
 
 
-/* This function is called when a station sends an ACK frame for an AssocResp
- * frame (status=success) and the matching AssocReq contained a WMM element.
- */
-int hostapd_wmm_sta_config(struct hostapd_data *hapd, struct sta_info *sta)
-{
-       /* update kernel STA data for WMM related items (WLAN_STA_WPA flag) */
-       if (sta->flags & WLAN_STA_WMM)
-               hostapd_sta_set_flags(hapd, sta->addr, sta->flags,
-                                     WLAN_STA_WMM, ~0);
-       else
-               hostapd_sta_set_flags(hapd, sta->addr, sta->flags,
-                                     0, ~WLAN_STA_WMM);
-
-       return 0;
-}
-
-
 static void wmm_send_action(struct hostapd_data *hapd, const u8 *addr,
                            const struct wmm_tspec_element *tspec,
                            u8 action_code, u8 dialogue_token, u8 status_code)

diff --git a/hostapd/wme.h b/hostapd/wme.h
index 0f242fd777d8a0a705d4152e4c784e379aff5461..8fd2b7c00e64aa71164594c93191a45f303d5457 100644 (file)
--- a/hostapd/wme.h
+++ b/hostapd/wme.h
@@ -21,15 +21,6 @@ struct ieee80211_mgmt;
 u8 * hostapd_eid_wmm(struct hostapd_data *hapd, u8 *eid);
 int hostapd_eid_wmm_valid(struct hostapd_data *hapd, const u8 *eid,
                          size_t len);
-#ifdef NEED_AP_MLME
-int hostapd_wmm_sta_config(struct hostapd_data *hapd, struct sta_info *sta);
-#else /* NEED_AP_MLME */
-static inline int hostapd_wmm_sta_config(struct hostapd_data *hapd,
-                                        struct sta_info *sta)
-{
-       return 0;
-}
-#endif /* NEED_AP_MLME */
 void hostapd_wmm_action(struct hostapd_data *hapd, struct ieee80211_mgmt *mgmt,
                        size_t len);
 int wmm_process_tspec(struct wmm_tspec_element *tspec);