diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2009-08-26 15:04:08 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-28 14:40:53 -0400 |
commit | 924d6356b216e592f596595757db8e955391a489 (patch) | |
tree | d3d78645121f5adf850e8ec02cdccbca0eb63921 /drivers/net/wireless/rt2x00/rt2x00mac.c | |
parent | 06e4da268c0e8f3b8408403d65e47d2885a78ff2 (diff) |
rt2x00: Cleanup rt2x00mac_bss_info_changed()
Since patch "rt2x00: bss_info_changed() callback is allowed to sleep" the
variable delayed wasn't used anymore. This means it can be removed
along with the call to schedule_work which depended on that variable.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00mac.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00mac.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index a91f316cd452..929b85f34f38 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c | |||
@@ -582,7 +582,6 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, | |||
582 | { | 582 | { |
583 | struct rt2x00_dev *rt2x00dev = hw->priv; | 583 | struct rt2x00_dev *rt2x00dev = hw->priv; |
584 | struct rt2x00_intf *intf = vif_to_intf(vif); | 584 | struct rt2x00_intf *intf = vif_to_intf(vif); |
585 | unsigned int delayed = 0; | ||
586 | int update_bssid = 0; | 585 | int update_bssid = 0; |
587 | 586 | ||
588 | /* | 587 | /* |
@@ -645,13 +644,6 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, | |||
645 | */ | 644 | */ |
646 | if (changes & ~(BSS_CHANGED_ASSOC | BSS_CHANGED_HT)) | 645 | if (changes & ~(BSS_CHANGED_ASSOC | BSS_CHANGED_HT)) |
647 | rt2x00lib_config_erp(rt2x00dev, intf, bss_conf); | 646 | rt2x00lib_config_erp(rt2x00dev, intf, bss_conf); |
648 | |||
649 | spin_lock(&intf->lock); | ||
650 | if (delayed) { | ||
651 | intf->delayed_flags |= delayed; | ||
652 | schedule_work(&rt2x00dev->intf_work); | ||
653 | } | ||
654 | spin_unlock(&intf->lock); | ||
655 | } | 647 | } |
656 | EXPORT_SYMBOL_GPL(rt2x00mac_bss_info_changed); | 648 | EXPORT_SYMBOL_GPL(rt2x00mac_bss_info_changed); |
657 | 649 | ||