summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-06-17 13:44:54 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2013-06-19 22:22:29 +0200
commite12bb70c04a439e8c47a98732bb8fe6dc895aef8 (patch)
treea1e2370dca675760095ea37b5fd5d71b1a76af96 /patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch
parent6002eb1233b07cd2eaddf75b34ce80c72af9d256 (diff)
backports: refresh patches on next-20130617backports-20130617
== ckmake-report.log == 1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.79 [ OK ] 18 3.1.10 [ OK ] 19 3.10-rc1 [ OK ] 20 3.2.45 [ OK ] 21 3.3.8 [ OK ] 22 3.4.46 [ OK ] 23 3.5.7 [ OK ] 24 3.6.11 [ OK ] 25 3.7.10 [ OK ] 26 3.8.13 [ OK ] 27 3.9.3 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch')
-rw-r--r--patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch b/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch
index 17220f2a..48074d76 100644
--- a/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch
+++ b/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
-@@ -324,10 +324,6 @@ struct wiphy *wiphy_new(const struct cfg
+@@ -327,10 +327,6 @@ struct wiphy *wiphy_new(const struct cfg
INIT_WORK(&rdev->sched_scan_results_wk, __cfg80211_sched_scan_results);
INIT_DELAYED_WORK(&rdev->dfs_update_channels_wk,
cfg80211_dfs_channels_update_work);
@@ -11,9 +11,9 @@
device_initialize(&rdev->wiphy.dev);
rdev->wiphy.dev.class = &ieee80211_class;
rdev->wiphy.dev.platform_data = rdev;
-@@ -829,6 +825,15 @@ static int cfg80211_netdev_notifier_call
+@@ -828,6 +824,15 @@ static int cfg80211_netdev_notifier_call
+ }
wdev->netdev = dev;
- wdev->sme_state = CFG80211_SME_IDLE;
#ifdef CONFIG_CFG80211_WEXT
+#ifdef CONFIG_WIRELESS_EXT
+ if (!dev->wireless_handlers)