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 9f0b2800a9d7084e198224c178b947779fe63a24..745c37e7992e1e410972dcfff89b332fdf619f30 100644 (file)
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -365,7 +365,7 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
 {
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        u8 *country_ie;
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_CFG80211_WEXT
        union iwreq_data wrqu;
 #endif
 
@@ -382,7 +382,7 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
                                    resp_ie, resp_ie_len,
                                    status, GFP_KERNEL);
 
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_CFG80211_WEXT
        if (wextev) {
                if (req_ie && status == WLAN_STATUS_SUCCESS) {
                        memset(&wrqu, 0, sizeof(wrqu));
@@ -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);
 
@@ -497,7 +498,7 @@ void __cfg80211_roamed(struct wireless_dev *wdev, const u8 *bssid,
                       const u8 *resp_ie, size_t resp_ie_len)
 {
        struct cfg80211_bss *bss;
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_CFG80211_WEXT
        union iwreq_data wrqu;
 #endif
 
@@ -532,7 +533,7 @@ void __cfg80211_roamed(struct wireless_dev *wdev, const u8 *bssid,
                            req_ie, req_ie_len, resp_ie, resp_ie_len,
                            GFP_KERNEL);
 
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_CFG80211_WEXT
        if (req_ie) {
                memset(&wrqu, 0, sizeof(wrqu));
                wrqu.data.length = req_ie_len;
@@ -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);
 
@@ -593,7 +594,7 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
        int i;
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_CFG80211_WEXT
        union iwreq_data wrqu;
 #endif
 
@@ -651,10 +652,11 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
                for (i = 0; i < 6; i++)
                        rdev->ops->del_key(wdev->wiphy, dev, i, NULL);
 
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_CFG80211_WEXT
        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);