diff options
| author | Senthil Balasubramanian <senthilkumar@atheros.com> | 2010-02-03 18:20:18 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-02-08 22:50:53 +0100 |
| commit | 1a20034a73a40b8056731f9db0c535cec2961eb7 (patch) | |
| tree | e64211e015baf1d53e4d26d12385ce0da8767364 /drivers | |
| parent | mac80211: allow station add/remove to sleep (diff) | |
| download | linux-1a20034a73a40b8056731f9db0c535cec2961eb7.tar.xz linux-1a20034a73a40b8056731f9db0c535cec2961eb7.zip | |
ath9k: configure the beacon only if the STA is associated
beacons configuration SHOULD be done only if the STA is associated.
Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/beacon.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c index 422454fe4ff0..d088ebfe63a6 100644 --- a/drivers/net/wireless/ath/ath9k/beacon.c +++ b/drivers/net/wireless/ath/ath9k/beacon.c @@ -577,6 +577,13 @@ static void ath_beacon_config_sta(struct ath_softc *sc, u64 tsf; int num_beacons, offset, dtim_dec_count, cfp_dec_count; + /* No need to configure beacon if we are not associated */ + if (!common->curaid) { + ath_print(common, ATH_DBG_BEACON, + "STA is not yet associated..skipping beacon config\n"); + return; + } + memset(&bs, 0, sizeof(bs)); intval = conf->beacon_interval & ATH9K_BEACON_PERIOD; @@ -739,7 +746,6 @@ void ath_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif) enum nl80211_iftype iftype; /* Setup the beacon configuration parameters */ - if (vif) { struct ieee80211_bss_conf *bss_conf = &vif->bss_conf; |