1 --- a/net/wireless/core.c
2 +++ b/net/wireless/core.c
3 @@ -472,10 +472,6 @@ use_default_name:
4 INIT_WORK(&rdev->mlme_unreg_wk, cfg80211_mlme_unreg_wk);
5 INIT_DELAYED_WORK(&rdev->dfs_update_channels_wk,
6 cfg80211_dfs_channels_update_work);
7 -#ifdef CONFIG_CFG80211_WEXT
8 - rdev->wiphy.wext = &cfg80211_wext_handler;
11 device_initialize(&rdev->wiphy.dev);
12 rdev->wiphy.dev.class = &ieee80211_class;
13 rdev->wiphy.dev.platform_data = rdev;
14 @@ -1182,6 +1178,15 @@ static int cfg80211_netdev_notifier_call
17 #ifdef CONFIG_CFG80211_WEXT
18 +#ifdef CONFIG_WIRELESS_EXT
19 + if (!dev->wireless_handlers)
20 + dev->wireless_handlers = &cfg80211_wext_handler;
22 + printk_once(KERN_WARNING "cfg80211: wext will not work because "
23 + "kernel was compiled with CONFIG_WIRELESS_EXT=n. "
24 + "Tools using wext interface, like iwconfig will "
27 wdev->wext.default_key = -1;
28 wdev->wext.default_mgmt_key = -1;
29 wdev->wext.connect.auth_type = NL80211_AUTHTYPE_AUTOMATIC;