@@ -28,7 +28,7 @@ Date: Fri Mar 1 14:03:49 2013 +0100
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -2550,6 +2550,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -2686,6 +2686,7 @@ static int nl80211_dump_wiphy(struct sk_
cb->nlh->nlmsg_seq,
NLM_F_MULTI, state);
if (ret < 0) {
@@ -36,7 +36,7 @@ Date: Fri Mar 1 14:03:49 2013 +0100
/*
* If sending the wiphy data didn't fit (ENOBUFS
* or EMSGSIZE returned), this SKB is still
-@@ -2571,6 +2572,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -2707,6 +2708,7 @@ static int nl80211_dump_wiphy(struct sk_
rtnl_unlock();
return 1;
}
@@ -1,12 +1,12 @@
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
-@@ -4552,6 +4552,9 @@ struct cfg80211_pmsr_capabilities {
+@@ -4695,6 +4695,9 @@ struct wiphy_iftype_akm_suites {
struct wiphy {
/* assign these fields before you register the wiphy */
+#define WIPHY_COMPAT_PAD_SIZE 2048
+ u8 padding[WIPHY_COMPAT_PAD_SIZE];
+
- /* permanent MAC address(es) */
u8 perm_addr[ETH_ALEN];
u8 addr_mask[ETH_ALEN];
+
@@ -11,7 +11,7 @@
device_initialize(&rdev->wiphy.dev);
rdev->wiphy.dev.class = &ieee80211_class;
rdev->wiphy.dev.platform_data = rdev;
-@@ -1296,6 +1292,15 @@ static int cfg80211_netdev_notifier_call
+@@ -1302,6 +1298,15 @@ static int cfg80211_netdev_notifier_call
}
wdev->netdev = dev;
#ifdef CONFIG_CFG80211_WEXT
@@ -1,6 +1,6 @@
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -8781,7 +8781,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -8998,7 +8998,9 @@ static int nl80211_dump_scan(struct sk_b
if (start == 0)
cfg80211_bss_expire(rdev);
@@ -1,6 +1,6 @@
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
-@@ -1310,6 +1310,7 @@ struct ieee80211_local {
+@@ -1314,6 +1314,7 @@ struct ieee80211_local {
struct mutex chanctx_mtx;
#ifdef CONFIG_MAC80211_LEDS
@@ -1,6 +1,6 @@
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -1128,9 +1128,29 @@ static void ieee80211_uninit(struct net_
+@@ -1127,9 +1127,29 @@ static void ieee80211_uninit(struct net_
ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
}
@@ -30,7 +30,7 @@
{
return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
}
-@@ -1173,9 +1193,29 @@ static const struct net_device_ops ieee8
+@@ -1172,9 +1192,29 @@ static const struct net_device_ops ieee8
.ndo_get_stats64 = ieee80211_get_stats64,
};
@@ -2,7 +2,7 @@ diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 04e5785..a251da1 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
-@@ -4701,12 +4701,12 @@ struct wiphy {
+@@ -4838,12 +4838,12 @@ struct wiphy {
static inline struct net *wiphy_net(struct wiphy *wiphy)
{
@@ -60,7 +60,7 @@
mvm->debugfs_dir, buf);
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
-@@ -2085,6 +2085,12 @@ void iwl_mvm_dbgfs_register(struct iwl_m
+@@ -2089,6 +2089,12 @@ void iwl_mvm_dbgfs_register(struct iwl_m
* Create a symlink with mac80211. It will be removed when mac80211
* exists (before the opmode exists which removes the target.)
*/
@@ -42,7 +42,7 @@
#endif /* FILS_AEAD_H */
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
-@@ -571,7 +571,9 @@ struct ieee80211_hw *ieee80211_alloc_hw_
+@@ -586,7 +586,9 @@ struct ieee80211_hw *ieee80211_alloc_hw_
NL80211_FEATURE_MAC_ON_CREATE |
NL80211_FEATURE_USERSPACE_MPM |
NL80211_FEATURE_FULL_AP_CLIENT_STATE;
@@ -51,4 +51,4 @@
+#endif
wiphy_ext_feature_set(wiphy,
NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211);
-
+ wiphy_ext_feature_set(wiphy,
@@ -1,6 +1,6 @@
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
-@@ -661,7 +661,11 @@ void ieee80211_amsdu_to_8023s(struct sk_
+@@ -666,7 +666,11 @@ void ieee80211_amsdu_to_8023s(struct sk_
u8 *payload;
int offset = 0, remaining;
struct ethhdr eth;
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -3790,7 +3790,7 @@ static const struct genl_ops hwsim_ops[]
+@@ -3859,7 +3859,7 @@ static const struct genl_ops hwsim_ops[]
},
};
@@ -1,6 +1,6 @@
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -14768,7 +14768,7 @@ static const struct genl_ops nl80211_ops
+@@ -15140,7 +15140,7 @@ static const struct genl_ops nl80211_ops
},
};
@@ -24,7 +24,7 @@
int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked)
{
struct brcmf_pub *drvr = ifp->drvr;
-@@ -870,7 +887,11 @@ struct brcmf_if *brcmf_add_if(struct brc
+@@ -879,7 +896,11 @@ struct brcmf_if *brcmf_add_if(struct brc
if (!ndev)
return ERR_PTR(-ENOMEM);
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- patches/0002-disable-dump-adjust-on-old-kernels.patch | 4 ++-- patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch | 4 ++-- .../0010-add-wext-handlers-to-netdev/net_wireless_core.patch | 2 +- patches/0014-netlink_seq/net_wireless_nl80211.patch | 2 +- patches/0024-led-blink-api/mac80211.patch | 2 +- patches/0028-select_queue/mac80211.patch | 4 ++-- patches/0053-possible_net_t.patch | 2 +- patches/0069-iwlwifi-pd-string-fix.patch | 2 +- patches/0070-mac80211-fils.patch | 4 ++-- patches/0071-skb-head_frag/wireless.patch | 2 +- patches/0077-genl-ro-after-init/hwsim.patch | 2 +- patches/0077-genl-ro-after-init/nl80211.patch | 2 +- patches/0079-netdev-destructor/brcmfmac.patch | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-)