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>
This commit is contained in:
parent
2e161f78e5
commit
418de6d955
|
@ -1190,7 +1190,7 @@ extern int ath5k_hw_set_opmode(struct ath5k_hw *ah, enum nl80211_iftype opmode);
|
|||
void ath5k_hw_set_coverage_class(struct ath5k_hw *ah, u8 coverage_class);
|
||||
/* BSSID Functions */
|
||||
int ath5k_hw_set_lladdr(struct ath5k_hw *ah, const u8 *mac);
|
||||
void ath5k_hw_set_associd(struct ath5k_hw *ah);
|
||||
void ath5k_hw_set_bssid(struct ath5k_hw *ah);
|
||||
void ath5k_hw_set_bssid_mask(struct ath5k_hw *ah, const u8 *mask);
|
||||
/* Receive start/stop functions */
|
||||
void ath5k_hw_start_rx_pcu(struct ath5k_hw *ah);
|
||||
|
|
|
@ -329,7 +329,7 @@ int ath5k_hw_attach(struct ath5k_softc *sc)
|
|||
|
||||
/* Set BSSID to bcast address: ff:ff:ff:ff:ff:ff for now */
|
||||
memcpy(common->curbssid, ath_bcast_mac, ETH_ALEN);
|
||||
ath5k_hw_set_associd(ah);
|
||||
ath5k_hw_set_bssid(ah);
|
||||
ath5k_hw_set_opmode(ah, sc->opmode);
|
||||
|
||||
ath5k_hw_rfgain_opt_init(ah);
|
||||
|
|
|
@ -3476,7 +3476,7 @@ static void ath5k_bss_info_changed(struct ieee80211_hw *hw,
|
|||
/* Cache for later use during resets */
|
||||
memcpy(common->curbssid, bss_conf->bssid, ETH_ALEN);
|
||||
common->curaid = 0;
|
||||
ath5k_hw_set_associd(ah);
|
||||
ath5k_hw_set_bssid(ah);
|
||||
mmiowb();
|
||||
}
|
||||
|
||||
|
@ -3494,7 +3494,7 @@ static void ath5k_bss_info_changed(struct ieee80211_hw *hw,
|
|||
"Bss Info ASSOC %d, bssid: %pM\n",
|
||||
bss_conf->aid, common->curbssid);
|
||||
common->curaid = bss_conf->aid;
|
||||
ath5k_hw_set_associd(ah);
|
||||
ath5k_hw_set_bssid(ah);
|
||||
/* Once ANI is available you would start it here */
|
||||
}
|
||||
}
|
||||
|
|
|
@ -308,27 +308,26 @@ int ath5k_hw_set_lladdr(struct ath5k_hw *ah, const u8 *mac)
|
|||
}
|
||||
|
||||
/**
|
||||
* ath5k_hw_set_associd - Set BSSID for association
|
||||
* ath5k_hw_set_bssid - Set current BSSID on hw
|
||||
*
|
||||
* @ah: The &struct ath5k_hw
|
||||
* @bssid: BSSID
|
||||
* @assoc_id: Assoc id
|
||||
*
|
||||
* Sets the BSSID which trigers the "SME Join" operation
|
||||
* Sets the current BSSID and BSSID mask we have from the
|
||||
* common struct into the hardware
|
||||
*/
|
||||
void ath5k_hw_set_associd(struct ath5k_hw *ah)
|
||||
void ath5k_hw_set_bssid(struct ath5k_hw *ah)
|
||||
{
|
||||
struct ath_common *common = ath5k_hw_common(ah);
|
||||
u16 tim_offset = 0;
|
||||
|
||||
/*
|
||||
* Set simple BSSID mask on 5212
|
||||
* Set BSSID mask on 5212
|
||||
*/
|
||||
if (ah->ah_version == AR5K_AR5212)
|
||||
ath_hw_setbssidmask(common);
|
||||
|
||||
/*
|
||||
* Set BSSID which triggers the "SME Join" operation
|
||||
* Set BSSID
|
||||
*/
|
||||
ath5k_hw_reg_write(ah,
|
||||
get_unaligned_le32(common->curbssid),
|
||||
|
|
|
@ -1160,7 +1160,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
|
|||
*/
|
||||
|
||||
/* Restore bssid and bssid mask */
|
||||
ath5k_hw_set_associd(ah);
|
||||
ath5k_hw_set_bssid(ah);
|
||||
|
||||
/* Set PCU config */
|
||||
ath5k_hw_set_opmode(ah, op_mode);
|
||||
|
|
Loading…
Reference in a new issue