--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
-@@ -3179,6 +3179,9 @@ struct wiphy_vendor_command {
+@@ -3182,6 +3182,9 @@ struct wiphy_vendor_command {
struct wiphy {
/* assign these fields before you register the wiphy */
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -6816,7 +6816,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -6848,7 +6848,9 @@ static int nl80211_dump_scan(struct sk_b
spin_lock_bh(&rdev->bss_lock);
cfg80211_bss_expire(rdev);
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
-@@ -1255,6 +1255,7 @@ struct ieee80211_local {
+@@ -1251,6 +1251,7 @@ struct ieee80211_local {
struct mutex chanctx_mtx;
#ifdef CONFIG_MAC80211_LEDS
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -1096,10 +1096,20 @@ static void ieee80211_uninit(struct net_
+@@ -1097,10 +1097,20 @@ static void ieee80211_uninit(struct net_
ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
}
{
return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
}
-@@ -1145,10 +1155,20 @@ static const struct net_device_ops ieee8
+@@ -1146,10 +1156,20 @@ static const struct net_device_ops ieee8
.ndo_get_stats64 = ieee80211_get_stats64,
};
index 04e5785..a251da1 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
-@@ -3305,12 +3305,12 @@ struct wiphy {
+@@ -3308,12 +3308,12 @@ struct wiphy {
static inline struct net *wiphy_net(struct wiphy *wiphy)
{