ath6kl: Pass vif instead of ar to ath6kl_add_new_sta()
authorVasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Sat, 21 Jan 2012 09:52:51 +0000 (15:22 +0530)
committerKalle Valo <kvalo@qca.qualcomm.com>
Tue, 24 Jan 2012 12:12:27 +0000 (14:12 +0200)
This will be used when initializing station specific aggregation
information.

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/ath6kl/main.c

index 3a3b2cc..acb4acb 100644 (file)
@@ -52,10 +52,11 @@ struct ath6kl_sta *ath6kl_find_sta_by_aid(struct ath6kl *ar, u8 aid)
        return conn;
 }
 
-static void ath6kl_add_new_sta(struct ath6kl *ar, u8 *mac, u16 aid, u8 *wpaie,
-                              size_t ielen, u8 keymgmt, u8 ucipher, u8 auth,
-                              u8 apsd_info)
+static void ath6kl_add_new_sta(struct ath6kl_vif *vif, u8 *mac, u16 aid,
+                              u8 *wpaie, size_t ielen, u8 keymgmt,
+                              u8 ucipher, u8 auth, u8 apsd_info)
 {
+       struct ath6kl *ar = vif->ar;
        struct ath6kl_sta *sta;
        u8 free_slot;
 
@@ -430,7 +431,6 @@ void ath6kl_connect_ap_mode_sta(struct ath6kl_vif *vif, u16 aid, u8 *mac_addr,
                                u8 keymgmt, u8 ucipher, u8 auth,
                                u8 assoc_req_len, u8 *assoc_info, u8 apsd_info)
 {
-       struct ath6kl *ar = vif->ar;
        u8 *ies = NULL, *wpa_ie = NULL, *pos;
        size_t ies_len = 0;
        struct station_info sinfo;
@@ -484,7 +484,7 @@ void ath6kl_connect_ap_mode_sta(struct ath6kl_vif *vif, u16 aid, u8 *mac_addr,
                pos += 2 + pos[1];
        }
 
-       ath6kl_add_new_sta(ar, mac_addr, aid, wpa_ie,
+       ath6kl_add_new_sta(vif, mac_addr, aid, wpa_ie,
                           wpa_ie ? 2 + wpa_ie[1] : 0,
                           keymgmt, ucipher, auth, apsd_info);