diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-29 10:06:05 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-29 10:06:05 +0400 |
| commit | b7f1d43a2ba1b63abbb1dcd966ab1edb9f62f636 (patch) | |
| tree | 9507b9d129ea8d7598d79f4b5674865483c7f00b /drivers/net/wireless/rt2x00/rt2x00mac.c | |
| parent | 6c9888532bb540cb692f51f1d34fe9344eed5a0d (diff) | |
| parent | ad43f8bfb7b9a6a8b800cdad24c4a62180a5eb3d (diff) | |
| download | linux-b7f1d43a2ba1b63abbb1dcd966ab1edb9f62f636.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
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, { 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); |