cfg80211: avoid flushing the global workqueue for core reg hints

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / wireless / sme.c

diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 0115d07d2c1a04fbc1a4d582264c5550298655b6..745c37e7992e1e410972dcfff89b332fdf619f30 100644 (file)
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -454,6 +454,7 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
         * - and country_ie[1] which is the IE length
         */
        regulatory_hint_11d(wdev->wiphy,
+                           bss->channel->band,
                            country_ie + 2,
                            country_ie[1]);
 }
@@ -488,7 +489,7 @@ void cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
        spin_lock_irqsave(&wdev->event_lock, flags);
        list_add_tail(&ev->list, &wdev->event_list);
        spin_unlock_irqrestore(&wdev->event_lock, flags);
-       schedule_work(&rdev->event_work);
+       queue_work(cfg80211_wq, &rdev->event_work);
 }
 EXPORT_SYMBOL(cfg80211_connect_result);
 
@@ -583,7 +584,7 @@ void cfg80211_roamed(struct net_device *dev, const u8 *bssid,
        spin_lock_irqsave(&wdev->event_lock, flags);
        list_add_tail(&ev->list, &wdev->event_list);
        spin_unlock_irqrestore(&wdev->event_lock, flags);
-       schedule_work(&rdev->event_work);
+       queue_work(cfg80211_wq, &rdev->event_work);
 }
 EXPORT_SYMBOL(cfg80211_roamed);
 
@@ -655,6 +656,7 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
        memset(&wrqu, 0, sizeof(wrqu));
        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
        wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
+       wdev->wext.connect.ssid_len = 0;
 #endif
 }
 
@@ -681,7 +683,7 @@ void cfg80211_disconnected(struct net_device *dev, u16 reason,
        spin_lock_irqsave(&wdev->event_lock, flags);
        list_add_tail(&ev->list, &wdev->event_list);
        spin_unlock_irqrestore(&wdev->event_lock, flags);
-       schedule_work(&rdev->event_work);
+       queue_work(cfg80211_wq, &rdev->event_work);
 }
 EXPORT_SYMBOL(cfg80211_disconnected);