aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath5k/pcu.c
diff options
context:
space:
mode:
authorNick Kossifidis <mickflemm@gmail.com>2010-08-15 13:03:10 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-24 16:27:58 -0400
commit418de6d955fa1da0cb4332661a31d21f57e954ab (patch)
treeef275b26166dafbdf68d8398a37ec3945c2758b8 /drivers/net/wireless/ath/ath5k/pcu.c
parent2e161f78e5f63a7f9fd25a766bb7f816a01eb14a (diff)
ath5k: rename ath5k_hw_set_associd to _set_bssid
Although the named function also sets the aid, its main purpose is configuring the bssid and we use that everywhere else. Signed-off-by: Bob Copeland <me@bobcopeland.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/pcu.c')
-rw-r--r--drivers/net/wireless/ath/ath5k/pcu.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c
index af273358c7cb..3fef5931ec3a 100644
--- a/drivers/net/wireless/ath/ath5k/pcu.c
+++ b/drivers/net/wireless/ath/ath5k/pcu.c
@@ -308,27 +308,26 @@ int ath5k_hw_set_lladdr(struct ath5k_hw *ah, const u8 *mac)
308} 308}
309 309
310/** 310/**
311 * ath5k_hw_set_associd - Set BSSID for association 311 * ath5k_hw_set_bssid - Set current BSSID on hw
312 * 312 *
313 * @ah: The &struct ath5k_hw 313 * @ah: The &struct ath5k_hw
314 * @bssid: BSSID
315 * @assoc_id: Assoc id
316 * 314 *
317 * Sets the BSSID which trigers the "SME Join" operation 315 * Sets the current BSSID and BSSID mask we have from the
316 * common struct into the hardware
318 */ 317 */
319void ath5k_hw_set_associd(struct ath5k_hw *ah) 318void ath5k_hw_set_bssid(struct ath5k_hw *ah)
320{ 319{
321 struct ath_common *common = ath5k_hw_common(ah); 320 struct ath_common *common = ath5k_hw_common(ah);
322 u16 tim_offset = 0; 321 u16 tim_offset = 0;
323 322
324 /* 323 /*
325 * Set simple BSSID mask on 5212 324 * Set BSSID mask on 5212
326 */ 325 */
327 if (ah->ah_version == AR5K_AR5212) 326 if (ah->ah_version == AR5K_AR5212)
328 ath_hw_setbssidmask(common); 327 ath_hw_setbssidmask(common);
329 328
330 /* 329 /*
331 * Set BSSID which triggers the "SME Join" operation 330 * Set BSSID
332 */ 331 */
333 ath5k_hw_reg_write(ah, 332 ath5k_hw_reg_write(ah,
334 get_unaligned_le32(common->curbssid), 333 get_unaligned_le32(common->curbssid),