aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath6kl/main.c
diff options
context:
space:
mode:
authorVasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>2012-01-21 04:52:51 -0500
committerKalle Valo <kvalo@qca.qualcomm.com>2012-01-24 07:12:27 -0500
commit17741c8db4f53200a51600d1644ee6a2b76f0984 (patch)
tree33f79ccce13ce3c9e82890ad2604a75bb24a6013 /drivers/net/wireless/ath/ath6kl/main.c
parent7baef812eb5f02ccacf6fac3888c1cfa36293e91 (diff)
ath6kl: Pass vif instead of ar to ath6kl_add_new_sta()
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>
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/main.c')
-rw-r--r--drivers/net/wireless/ath/ath6kl/main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c
index 3a3b2cc9940d..acb4acb71718 100644
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
@@ -52,10 +52,11 @@ struct ath6kl_sta *ath6kl_find_sta_by_aid(struct ath6kl *ar, u8 aid)
52 return conn; 52 return conn;
53} 53}
54 54
55static void ath6kl_add_new_sta(struct ath6kl *ar, u8 *mac, u16 aid, u8 *wpaie, 55static void ath6kl_add_new_sta(struct ath6kl_vif *vif, u8 *mac, u16 aid,
56 size_t ielen, u8 keymgmt, u8 ucipher, u8 auth, 56 u8 *wpaie, size_t ielen, u8 keymgmt,
57 u8 apsd_info) 57 u8 ucipher, u8 auth, u8 apsd_info)
58{ 58{
59 struct ath6kl *ar = vif->ar;
59 struct ath6kl_sta *sta; 60 struct ath6kl_sta *sta;
60 u8 free_slot; 61 u8 free_slot;
61 62
@@ -430,7 +431,6 @@ void ath6kl_connect_ap_mode_sta(struct ath6kl_vif *vif, u16 aid, u8 *mac_addr,
430 u8 keymgmt, u8 ucipher, u8 auth, 431 u8 keymgmt, u8 ucipher, u8 auth,
431 u8 assoc_req_len, u8 *assoc_info, u8 apsd_info) 432 u8 assoc_req_len, u8 *assoc_info, u8 apsd_info)
432{ 433{
433 struct ath6kl *ar = vif->ar;
434 u8 *ies = NULL, *wpa_ie = NULL, *pos; 434 u8 *ies = NULL, *wpa_ie = NULL, *pos;
435 size_t ies_len = 0; 435 size_t ies_len = 0;
436 struct station_info sinfo; 436 struct station_info sinfo;
@@ -484,7 +484,7 @@ void ath6kl_connect_ap_mode_sta(struct ath6kl_vif *vif, u16 aid, u8 *mac_addr,
484 pos += 2 + pos[1]; 484 pos += 2 + pos[1];
485 } 485 }
486 486
487 ath6kl_add_new_sta(ar, mac_addr, aid, wpa_ie, 487 ath6kl_add_new_sta(vif, mac_addr, aid, wpa_ie,
488 wpa_ie ? 2 + wpa_ie[1] : 0, 488 wpa_ie ? 2 + wpa_ie[1] : 0,
489 keymgmt, ucipher, auth, apsd_info); 489 keymgmt, ucipher, auth, apsd_info);
490 490