diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-05-18 04:53:18 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-05-20 14:46:28 -0400 |
commit | 3f0d843b5c94be824c2027f01348f360958e5542 (patch) | |
tree | 0bfdbf899df143df6b9022b6584516f4f4e16532 /drivers/net/wireless/b43legacy | |
parent | ff561ac84e0bdfe1316ed355669dd73101609f24 (diff) |
b43/legacy: fix beacon change processing
Process beacon change even if the BSSID doesn't
change at the same time. Also fix what I think
is a small locking error in b43legacy, there's
a spin_unlock_irqrestore that looks out of place.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43legacy')
-rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 0062b340d989..f6f3fbf0a2f4 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c | |||
@@ -2787,27 +2787,24 @@ static void b43legacy_op_bss_info_changed(struct ieee80211_hw *hw, | |||
2787 | b43legacy_write32(dev, B43legacy_MMIO_GEN_IRQ_MASK, 0); | 2787 | b43legacy_write32(dev, B43legacy_MMIO_GEN_IRQ_MASK, 0); |
2788 | 2788 | ||
2789 | if (changed & BSS_CHANGED_BSSID) { | 2789 | if (changed & BSS_CHANGED_BSSID) { |
2790 | spin_unlock_irqrestore(&wl->irq_lock, flags); | ||
2791 | b43legacy_synchronize_irq(dev); | 2790 | b43legacy_synchronize_irq(dev); |
2792 | 2791 | ||
2793 | if (conf->bssid) | 2792 | if (conf->bssid) |
2794 | memcpy(wl->bssid, conf->bssid, ETH_ALEN); | 2793 | memcpy(wl->bssid, conf->bssid, ETH_ALEN); |
2795 | else | 2794 | else |
2796 | memset(wl->bssid, 0, ETH_ALEN); | 2795 | memset(wl->bssid, 0, ETH_ALEN); |
2796 | } | ||
2797 | |||
2798 | if (b43legacy_status(dev) >= B43legacy_STAT_INITIALIZED) { | ||
2799 | if (changed & BSS_CHANGED_BEACON && | ||
2800 | (b43legacy_is_mode(wl, NL80211_IFTYPE_AP) || | ||
2801 | b43legacy_is_mode(wl, NL80211_IFTYPE_ADHOC))) | ||
2802 | b43legacy_update_templates(wl); | ||
2797 | 2803 | ||
2798 | if (b43legacy_status(dev) >= B43legacy_STAT_INITIALIZED) { | 2804 | if (changed & BSS_CHANGED_BSSID) |
2799 | if (b43legacy_is_mode(wl, NL80211_IFTYPE_AP)) { | ||
2800 | B43legacy_WARN_ON(vif->type != NL80211_IFTYPE_AP); | ||
2801 | if (changed & BSS_CHANGED_BEACON) | ||
2802 | b43legacy_update_templates(wl); | ||
2803 | } else if (b43legacy_is_mode(wl, NL80211_IFTYPE_ADHOC)) { | ||
2804 | if (changed & BSS_CHANGED_BEACON) | ||
2805 | b43legacy_update_templates(wl); | ||
2806 | } | ||
2807 | b43legacy_write_mac_bssid_templates(dev); | 2805 | b43legacy_write_mac_bssid_templates(dev); |
2808 | } | ||
2809 | spin_unlock_irqrestore(&wl->irq_lock, flags); | ||
2810 | } | 2806 | } |
2807 | spin_unlock_irqrestore(&wl->irq_lock, flags); | ||
2811 | 2808 | ||
2812 | b43legacy_mac_suspend(dev); | 2809 | b43legacy_mac_suspend(dev); |
2813 | 2810 | ||