aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/main.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/main.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/main.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 12e0ac688274..8469d7c8744a 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1891,6 +1891,7 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
1891 u32 changed) 1891 u32 changed)
1892{ 1892{
1893 struct ath_softc *sc = hw->priv; 1893 struct ath_softc *sc = hw->priv;
1894 struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
1894 struct ath_hw *ah = sc->sc_ah; 1895 struct ath_hw *ah = sc->sc_ah;
1895 struct ath_common *common = ath9k_hw_common(ah); 1896 struct ath_common *common = ath9k_hw_common(ah);
1896 struct ath_vif *avp = (void *)vif->drv_priv; 1897 struct ath_vif *avp = (void *)vif->drv_priv;
@@ -1949,7 +1950,7 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
1949 ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq); 1950 ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);
1950 1951
1951 if (changed & BSS_CHANGED_BEACON_INT) { 1952 if (changed & BSS_CHANGED_BEACON_INT) {
1952 sc->beacon_interval = bss_conf->beacon_int; 1953 cur_conf->beacon_interval = bss_conf->beacon_int;
1953 /* 1954 /*
1954 * In case of AP mode, the HW TSF has to be reset 1955 * In case of AP mode, the HW TSF has to be reset
1955 * when the beacon interval changes. 1956 * when the beacon interval changes.