OSDN Git Service

rt2x00: Cleanup rt2x00mac_bss_info_changed()
authorIvo van Doorn <ivdoorn@gmail.com>
Wed, 26 Aug 2009 19:04:08 +0000 (21:04 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Aug 2009 18:40:53 +0000 (14:40 -0400)
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>
drivers/net/wireless/rt2x00/rt2x00mac.c

index a91f316..929b85f 100644 (file)
@@ -582,7 +582,6 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
 {
        struct rt2x00_dev *rt2x00dev = hw->priv;
        struct rt2x00_intf *intf = vif_to_intf(vif);
-       unsigned int delayed = 0;
        int update_bssid = 0;
 
        /*
@@ -645,13 +644,6 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
         */
        if (changes & ~(BSS_CHANGED_ASSOC | BSS_CHANGED_HT))
                rt2x00lib_config_erp(rt2x00dev, intf, bss_conf);
-
-       spin_lock(&intf->lock);
-       if (delayed) {
-               intf->delayed_flags |= delayed;
-               schedule_work(&rt2x00dev->intf_work);
-       }
-       spin_unlock(&intf->lock);
 }
 EXPORT_SYMBOL_GPL(rt2x00mac_bss_info_changed);