diff options
| author | Senthil Balasubramanian <senthilkumar@atheros.com> | 2010-02-03 12:20:18 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-01 19:01:57 -0400 |
| commit | 7c74e3f2e97f7bdcb56b72919201af941ea0b4e6 (patch) | |
| tree | 587cfea555a6d08c57fceee8b5ddf86344e5f7a0 /drivers | |
| parent | eb4265ff035b929a44fe58b8f2fd09a45e7fea07 (diff) | |
ath9k: configure the beacon only if the STA is associated
commit 1a20034a73a40b8056731f9db0c535cec2961eb7 upstream.
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>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/beacon.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c index 06eaaa9ece6b..20b1fd39451d 100644 --- a/drivers/net/wireless/ath/ath9k/beacon.c +++ b/drivers/net/wireless/ath/ath9k/beacon.c | |||
| @@ -573,6 +573,13 @@ static void ath_beacon_config_sta(struct ath_softc *sc, | |||
| 573 | u64 tsf; | 573 | u64 tsf; |
| 574 | int num_beacons, offset, dtim_dec_count, cfp_dec_count; | 574 | int num_beacons, offset, dtim_dec_count, cfp_dec_count; |
| 575 | 575 | ||
| 576 | /* No need to configure beacon if we are not associated */ | ||
| 577 | if (!common->curaid) { | ||
| 578 | ath_print(common, ATH_DBG_BEACON, | ||
| 579 | "STA is not yet associated..skipping beacon config\n"); | ||
| 580 | return; | ||
| 581 | } | ||
| 582 | |||
| 576 | memset(&bs, 0, sizeof(bs)); | 583 | memset(&bs, 0, sizeof(bs)); |
| 577 | intval = conf->beacon_interval & ATH9K_BEACON_PERIOD; | 584 | intval = conf->beacon_interval & ATH9K_BEACON_PERIOD; |
| 578 | 585 | ||