ar9170: remove unnecessary calls to ar9170_set_beacon_timers

PATCH Superseded Joerg Albert 1 participant 1 message Aug 5, 2009

Share & tools

Joerg Albert

author

2009-08-05 00:16 UTC #0 lore raw

PATCH 2/2 ar9170: remove unnecessary calls to ar9170_set_beacon_timers

ar9170_op_remove_interface: mac80211 calls us before with
BSS_CHANGED_BEACON_ENABLED set and bss_conf->enable_beacon == 0
ar9170_op_config: this was a bogus call; mac80211 never sets
BSS_CHANGED_BEACON_ENABLED here

Signed-off-by Joerg Albert <[email protected]>

---
 drivers/net/wireless/ath/ar9170/main.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

drivers/net/wireless/ath/ar9170/main.c +0 -7

index d51b6ad..693a999 100644
@@ -1990,7 +1990,6 @@ static void ar9170_op_remove_interface(struct ieee80211_hw *hw,
 	ar->vif = NULL;
 	ar->want_filter = 0;
 	ar9170_update_frame_filter(ar);
-	ar9170_set_beacon_timers(ar);
 	dev_kfree_skb(ar->beacon);
 	ar->beacon = NULL;
 	ar->sniffer_enabled = false;

@@ -2032,12 +2031,6 @@ static int ar9170_op_config(struct ieee80211_hw *hw, u32 changed)
 			goto out;
 	}
 
-	if (changed & BSS_CHANGED_BEACON_INT) {
-		err = ar9170_set_beacon_timers(ar);
-		if (err)
-			goto out;
-	}
-
 	if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
 
 		/* adjust slot time for 5 GHz */

Signature · 1 line

1.6.0.4