diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-04-01 13:52:48 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-04 16:20:07 -0400 |
| commit | 26d59535aa08386b97ece58a27bb16fca4f066db (patch) | |
| tree | 13949e0c77c36c502d99d417a72188189c87e0b6 /net/mac80211/main.c | |
| parent | ccc7c28af205888798b51b6cbc0b557ac1170a49 (diff) | |
| download | kernel_samsung_smdk4412-26d59535aa08386b97ece58a27bb16fca4f066db.zip kernel_samsung_smdk4412-26d59535aa08386b97ece58a27bb16fca4f066db.tar.gz kernel_samsung_smdk4412-26d59535aa08386b97ece58a27bb16fca4f066db.tar.bz2 | |
mac80211: clean up station cleanup timer
We currently run this timer exactly once when
a new mac80211 device is registered, but that
is completely pointless since it will have no
work to do at all. Therefore, remove that and
also simplify some code using the timer.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 562d298..dc50fc31 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -879,10 +879,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) local->dynamic_ps_forced_timeout = -1; - result = sta_info_start(local); - if (result < 0) - goto fail_sta_info; - result = ieee80211_wep_init(local); if (result < 0) wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n", @@ -945,7 +941,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) rtnl_unlock(); ieee80211_wep_free(local); sta_info_stop(local); - fail_sta_info: destroy_workqueue(local->workqueue); fail_workqueue: wiphy_unregister(local->hw.wiphy); |