summaryrefslogtreecommitdiff
path: root/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2017-09-17 18:58:10 +0200
committerJohannes Berg <johannes.berg@intel.com>2017-09-21 15:16:55 +0200
commit0acb6552992e7fb62b24a5ed48f46250fdff0494 (patch)
tree15719bb5e469848c50cae42aaa533c355ba04dbe /patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
parent75ed12f298e69fcf618aeeefe89e507f8cfac87a (diff)
patches: refresh patches on v4.14-rc1
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch')
-rw-r--r--patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch b/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
index 437775cb..db8cbe68 100644
--- a/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
+++ b/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
-@@ -433,10 +433,6 @@ use_default_name:
+@@ -472,10 +472,6 @@ use_default_name:
INIT_WORK(&rdev->mlme_unreg_wk, cfg80211_mlme_unreg_wk);
INIT_DELAYED_WORK(&rdev->dfs_update_channels_wk,
cfg80211_dfs_channels_update_work);
@@ -11,7 +11,7 @@
device_initialize(&rdev->wiphy.dev);
rdev->wiphy.dev.class = &ieee80211_class;
rdev->wiphy.dev.platform_data = rdev;
-@@ -1043,6 +1039,15 @@ static int cfg80211_netdev_notifier_call
+@@ -1182,6 +1178,15 @@ static int cfg80211_netdev_notifier_call
}
wdev->netdev = dev;
#ifdef CONFIG_CFG80211_WEXT