aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorSenthil Balasubramanian <senthilkumar@atheros.com>2009-06-24 09:26:39 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 15:02:24 -0400
commit2664f201ef162224c775ecf7e33aee9c4cac62b0 (patch)
treeebf53a97290ddb9d268c56d3ea7f8b53c8e90cac /drivers/net
parentd8c9210757605c5191d2d9f4e09be5e59ceac824 (diff)
ath9k: remove unnecessary STATION mode check.
Remove unncessary STATION mode check in ath9k_bss_assoc_info() as it is called only for STATION mode. Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ath/ath9k/main.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 66a6c1f5022a..48cb5534bd14 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -920,24 +920,21 @@ static void ath9k_bss_assoc_info(struct ath_softc *sc,
920 struct ieee80211_vif *vif, 920 struct ieee80211_vif *vif,
921 struct ieee80211_bss_conf *bss_conf) 921 struct ieee80211_bss_conf *bss_conf)
922{ 922{
923 struct ath_vif *avp = (void *)vif->drv_priv;
924 923
925 if (bss_conf->assoc) { 924 if (bss_conf->assoc) {
926 DPRINTF(sc, ATH_DBG_CONFIG, "Bss Info ASSOC %d, bssid: %pM\n", 925 DPRINTF(sc, ATH_DBG_CONFIG, "Bss Info ASSOC %d, bssid: %pM\n",
927 bss_conf->aid, sc->curbssid); 926 bss_conf->aid, sc->curbssid);
928 927
929 /* New association, store aid */ 928 /* New association, store aid */
930 if (avp->av_opmode == NL80211_IFTYPE_STATION) { 929 sc->curaid = bss_conf->aid;
931 sc->curaid = bss_conf->aid; 930 ath9k_hw_write_associd(sc);
932 ath9k_hw_write_associd(sc);
933 931
934 /* 932 /*
935 * Request a re-configuration of Beacon related timers 933 * Request a re-configuration of Beacon related timers
936 * on the receipt of the first Beacon frame (i.e., 934 * on the receipt of the first Beacon frame (i.e.,
937 * after time sync with the AP). 935 * after time sync with the AP).
938 */ 936 */
939 sc->sc_flags |= SC_OP_BEACON_SYNC; 937 sc->sc_flags |= SC_OP_BEACON_SYNC;
940 }
941 938
942 /* Configure the beacon */ 939 /* Configure the beacon */
943 ath_beacon_config(sc, vif); 940 ath_beacon_config(sc, vif);