aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/sme.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/wireless/sme.c')
-rw-r--r--net/wireless/sme.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 93c3ed32920..d3624152f7f 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -345,7 +345,7 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
345{ 345{
346 struct wireless_dev *wdev = dev->ieee80211_ptr; 346 struct wireless_dev *wdev = dev->ieee80211_ptr;
347 u8 *country_ie; 347 u8 *country_ie;
348#ifdef CONFIG_WIRELESS_EXT 348#ifdef CONFIG_CFG80211_WEXT
349 union iwreq_data wrqu; 349 union iwreq_data wrqu;
350#endif 350#endif
351 351
@@ -362,7 +362,7 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
362 resp_ie, resp_ie_len, 362 resp_ie, resp_ie_len,
363 status, GFP_KERNEL); 363 status, GFP_KERNEL);
364 364
365#ifdef CONFIG_WIRELESS_EXT 365#ifdef CONFIG_CFG80211_WEXT
366 if (wextev) { 366 if (wextev) {
367 if (req_ie && status == WLAN_STATUS_SUCCESS) { 367 if (req_ie && status == WLAN_STATUS_SUCCESS) {
368 memset(&wrqu, 0, sizeof(wrqu)); 368 memset(&wrqu, 0, sizeof(wrqu));
@@ -477,7 +477,7 @@ void __cfg80211_roamed(struct wireless_dev *wdev, const u8 *bssid,
477 const u8 *resp_ie, size_t resp_ie_len) 477 const u8 *resp_ie, size_t resp_ie_len)
478{ 478{
479 struct cfg80211_bss *bss; 479 struct cfg80211_bss *bss;
480#ifdef CONFIG_WIRELESS_EXT 480#ifdef CONFIG_CFG80211_WEXT
481 union iwreq_data wrqu; 481 union iwreq_data wrqu;
482#endif 482#endif
483 483
@@ -512,7 +512,7 @@ void __cfg80211_roamed(struct wireless_dev *wdev, const u8 *bssid,
512 req_ie, req_ie_len, resp_ie, resp_ie_len, 512 req_ie, req_ie_len, resp_ie, resp_ie_len,
513 GFP_KERNEL); 513 GFP_KERNEL);
514 514
515#ifdef CONFIG_WIRELESS_EXT 515#ifdef CONFIG_CFG80211_WEXT
516 if (req_ie) { 516 if (req_ie) {
517 memset(&wrqu, 0, sizeof(wrqu)); 517 memset(&wrqu, 0, sizeof(wrqu));
518 wrqu.data.length = req_ie_len; 518 wrqu.data.length = req_ie_len;
@@ -573,7 +573,7 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
573 struct wireless_dev *wdev = dev->ieee80211_ptr; 573 struct wireless_dev *wdev = dev->ieee80211_ptr;
574 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); 574 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
575 int i; 575 int i;
576#ifdef CONFIG_WIRELESS_EXT 576#ifdef CONFIG_CFG80211_WEXT
577 union iwreq_data wrqu; 577 union iwreq_data wrqu;
578#endif 578#endif
579 579
@@ -631,7 +631,7 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
631 for (i = 0; i < 6; i++) 631 for (i = 0; i < 6; i++)
632 rdev->ops->del_key(wdev->wiphy, dev, i, NULL); 632 rdev->ops->del_key(wdev->wiphy, dev, i, NULL);
633 633
634#ifdef CONFIG_WIRELESS_EXT 634#ifdef CONFIG_CFG80211_WEXT
635 memset(&wrqu, 0, sizeof(wrqu)); 635 memset(&wrqu, 0, sizeof(wrqu));
636 wrqu.ap_addr.sa_family = ARPHRD_ETHER; 636 wrqu.ap_addr.sa_family = ARPHRD_ETHER;
637 wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL); 637 wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);