aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/beacon.c
diff options
context:
space:
mode:
authorSteve Brown <sbrown@cortland.com>2011-02-07 19:10:39 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-02-09 16:09:48 -0500
commit9814f6b34be5179849c0872e81eb99286ef4b051 (patch)
tree863e6507e0141acec4492f5b941490e3f5458204 /drivers/net/wireless/ath/ath9k/beacon.c
parent59bdf3b0fe7a183f18ce94696259c4c76abb4568 (diff)
ath9k: Remove redundant beacon_interval
The variable appears in both ath_softc and ath_beacon_config. The struct ath_beacon_config is embedded in ath_softc. The redundant variable was added by commit id 57c4d7b4c4986037be51476b8e3025d5ba18d8b8. Signed-off-by: Steve Brown <sbrown@cortland.com> Reviewed-by: Mohammed Shafi <shafi.ath9k@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/beacon.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/beacon.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index fcb36abfc309..ed6e7d66fc38 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -226,6 +226,7 @@ int ath_beacon_alloc(struct ath_softc *sc, struct ieee80211_vif *vif)
226 struct ath_vif *avp; 226 struct ath_vif *avp;
227 struct ath_buf *bf; 227 struct ath_buf *bf;
228 struct sk_buff *skb; 228 struct sk_buff *skb;
229 struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
229 __le64 tstamp; 230 __le64 tstamp;
230 231
231 avp = (void *)vif->drv_priv; 232 avp = (void *)vif->drv_priv;
@@ -282,7 +283,7 @@ int ath_beacon_alloc(struct ath_softc *sc, struct ieee80211_vif *vif)
282 u64 tsfadjust; 283 u64 tsfadjust;
283 int intval; 284 int intval;
284 285
285 intval = sc->beacon_interval ? : ATH_DEFAULT_BINTVAL; 286 intval = cur_conf->beacon_interval ? : ATH_DEFAULT_BINTVAL;
286 287
287 /* 288 /*
288 * Calculate the TSF offset for this beacon slot, i.e., the 289 * Calculate the TSF offset for this beacon slot, i.e., the
@@ -346,6 +347,7 @@ void ath_beacon_return(struct ath_softc *sc, struct ath_vif *avp)
346void ath_beacon_tasklet(unsigned long data) 347void ath_beacon_tasklet(unsigned long data)
347{ 348{
348 struct ath_softc *sc = (struct ath_softc *)data; 349 struct ath_softc *sc = (struct ath_softc *)data;
350 struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
349 struct ath_hw *ah = sc->sc_ah; 351 struct ath_hw *ah = sc->sc_ah;
350 struct ath_common *common = ath9k_hw_common(ah); 352 struct ath_common *common = ath9k_hw_common(ah);
351 struct ath_buf *bf = NULL; 353 struct ath_buf *bf = NULL;
@@ -393,7 +395,7 @@ void ath_beacon_tasklet(unsigned long data)
393 * on the tsf to safeguard against missing an swba. 395 * on the tsf to safeguard against missing an swba.
394 */ 396 */
395 397
396 intval = sc->beacon_interval ? : ATH_DEFAULT_BINTVAL; 398 intval = cur_conf->beacon_interval ? : ATH_DEFAULT_BINTVAL;
397 399
398 tsf = ath9k_hw_gettsf64(ah); 400 tsf = ath9k_hw_gettsf64(ah);
399 tsftu = TSF_TO_TU(tsf>>32, tsf); 401 tsftu = TSF_TO_TU(tsf>>32, tsf);