aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/subsys
diff options
context:
space:
mode:
Diffstat (limited to 'package/kernel/mac80211/patches/subsys')
-rw-r--r--package/kernel/mac80211/patches/subsys/303-mac80211-minstrel-Enable-STBC-and-LDPC-for-VHT-Rates.patch (renamed from package/kernel/mac80211/patches/subsys/359-mac80211-minstrel-Enable-STBC-and-LDPC-for-VHT-Rates.patch)0
-rw-r--r--package/kernel/mac80211/patches/subsys/304-mac80211-minstrel-remove-unnecessary-debugfs-cleanup.patch (renamed from package/kernel/mac80211/patches/subsys/370-mac80211-minstrel-remove-unnecessary-debugfs-cleanup.patch)0
-rw-r--r--package/kernel/mac80211/patches/subsys/305-mac80211-minstrel-merge-with-minstrel_ht-always-enab.patch (renamed from package/kernel/mac80211/patches/subsys/371-mac80211-minstrel-merge-with-minstrel_ht-always-enab.patch)0
-rw-r--r--package/kernel/mac80211/patches/subsys/306-mac80211-minstrel-reduce-minstrel_mcs_groups-size.patch (renamed from package/kernel/mac80211/patches/subsys/372-mac80211-minstrel-reduce-minstrel_mcs_groups-size.patch)86
-rw-r--r--package/kernel/mac80211/patches/subsys/307-mac80211-minstrel-fix-using-short-preamble-CCK-rates.patch (renamed from package/kernel/mac80211/patches/subsys/373-mac80211-minstrel-fix-using-short-preamble-CCK-rates.patch)0
-rw-r--r--package/kernel/mac80211/patches/subsys/308-mac80211-minstrel-fix-CCK-rate-group-streams-value.patch (renamed from package/kernel/mac80211/patches/subsys/375-mac80211-minstrel-fix-CCK-rate-group-streams-value.patch)0
-rw-r--r--package/kernel/mac80211/patches/subsys/309-mac80211-minstrel-fix-sampling-reporting-of-CCK-rate.patch (renamed from package/kernel/mac80211/patches/subsys/376-mac80211-minstrel-fix-sampling-reporting-of-CCK-rate.patch)0
-rw-r--r--package/kernel/mac80211/patches/subsys/310-mac80211-minstrel-do-not-sample-rates-3-times-slower.patch (renamed from package/kernel/mac80211/patches/subsys/377-mac80211-minstrel-do-not-sample-rates-3-times-slower.patch)0
-rw-r--r--package/kernel/mac80211/patches/subsys/311-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch (renamed from package/kernel/mac80211/patches/subsys/378-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch)6
-rw-r--r--package/kernel/mac80211/patches/subsys/312-mac80211-minstrel_ht-add-flag-to-indicate-missing-in.patch (renamed from package/kernel/mac80211/patches/subsys/383-mac80211-minstrel_ht-add-flag-to-indicate-missing-in.patch)17
-rw-r--r--package/kernel/mac80211/patches/subsys/350-mac80211-add-hdrlen-to-ieee80211_tx_data.patch (renamed from package/kernel/mac80211/patches/subsys/357-mac80211-add-hdrlen-to-ieee80211_tx_data.patch)23
-rw-r--r--package/kernel/mac80211/patches/subsys/351-mac80211-add-TX_NEEDS_ALIGNED4_SKBS-hw-flag.patch304
-rw-r--r--package/kernel/mac80211/patches/subsys/358-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch233
-rw-r--r--package/kernel/mac80211/patches/subsys/390-nl-mac-80211-allow-4addr-AP-operation-on-crypto-cont.patch2
14 files changed, 371 insertions, 300 deletions
diff --git a/package/kernel/mac80211/patches/subsys/359-mac80211-minstrel-Enable-STBC-and-LDPC-for-VHT-Rates.patch b/package/kernel/mac80211/patches/subsys/303-mac80211-minstrel-Enable-STBC-and-LDPC-for-VHT-Rates.patch
index 661fb46ea4..661fb46ea4 100644
--- a/package/kernel/mac80211/patches/subsys/359-mac80211-minstrel-Enable-STBC-and-LDPC-for-VHT-Rates.patch
+++ b/package/kernel/mac80211/patches/subsys/303-mac80211-minstrel-Enable-STBC-and-LDPC-for-VHT-Rates.patch
diff --git a/package/kernel/mac80211/patches/subsys/370-mac80211-minstrel-remove-unnecessary-debugfs-cleanup.patch b/package/kernel/mac80211/patches/subsys/304-mac80211-minstrel-remove-unnecessary-debugfs-cleanup.patch
index 95d4f294aa..95d4f294aa 100644
--- a/package/kernel/mac80211/patches/subsys/370-mac80211-minstrel-remove-unnecessary-debugfs-cleanup.patch
+++ b/package/kernel/mac80211/patches/subsys/304-mac80211-minstrel-remove-unnecessary-debugfs-cleanup.patch
diff --git a/package/kernel/mac80211/patches/subsys/371-mac80211-minstrel-merge-with-minstrel_ht-always-enab.patch b/package/kernel/mac80211/patches/subsys/305-mac80211-minstrel-merge-with-minstrel_ht-always-enab.patch
index 9a233753ad..9a233753ad 100644
--- a/package/kernel/mac80211/patches/subsys/371-mac80211-minstrel-merge-with-minstrel_ht-always-enab.patch
+++ b/package/kernel/mac80211/patches/subsys/305-mac80211-minstrel-merge-with-minstrel_ht-always-enab.patch
diff --git a/package/kernel/mac80211/patches/subsys/372-mac80211-minstrel-reduce-minstrel_mcs_groups-size.patch b/package/kernel/mac80211/patches/subsys/306-mac80211-minstrel-reduce-minstrel_mcs_groups-size.patch
index 02a0ca0a52..fa51f1be7e 100644
--- a/package/kernel/mac80211/patches/subsys/372-mac80211-minstrel-reduce-minstrel_mcs_groups-size.patch
+++ b/package/kernel/mac80211/patches/subsys/306-mac80211-minstrel-reduce-minstrel_mcs_groups-size.patch
@@ -136,82 +136,72 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
- MCS_GROUP(1, 0, BW_20),
- MCS_GROUP(2, 0, BW_20),
- MCS_GROUP(3, 0, BW_20),
--
-- MCS_GROUP(1, 1, BW_20),
-- MCS_GROUP(2, 1, BW_20),
-- MCS_GROUP(3, 1, BW_20),
--
-- MCS_GROUP(1, 0, BW_40),
-- MCS_GROUP(2, 0, BW_40),
-- MCS_GROUP(3, 0, BW_40),
--
-- MCS_GROUP(1, 1, BW_40),
-- MCS_GROUP(2, 1, BW_40),
-- MCS_GROUP(3, 1, BW_40),
--
-- CCK_GROUP,
--
-- VHT_GROUP(1, 0, BW_20),
-- VHT_GROUP(2, 0, BW_20),
-- VHT_GROUP(3, 0, BW_20),
--
-- VHT_GROUP(1, 1, BW_20),
-- VHT_GROUP(2, 1, BW_20),
-- VHT_GROUP(3, 1, BW_20),
--
-- VHT_GROUP(1, 0, BW_40),
-- VHT_GROUP(2, 0, BW_40),
-- VHT_GROUP(3, 0, BW_40),
--
-- VHT_GROUP(1, 1, BW_40),
-- VHT_GROUP(2, 1, BW_40),
-- VHT_GROUP(3, 1, BW_40),
--
-- VHT_GROUP(1, 0, BW_80),
-- VHT_GROUP(2, 0, BW_80),
-- VHT_GROUP(3, 0, BW_80),
--
-- VHT_GROUP(1, 1, BW_80),
-- VHT_GROUP(2, 1, BW_80),
-- VHT_GROUP(3, 1, BW_80),
+ MCS_GROUP(1, 0, BW_20, 5),
+ MCS_GROUP(2, 0, BW_20, 4),
+ MCS_GROUP(3, 0, BW_20, 4),
-+
+
+- MCS_GROUP(1, 1, BW_20),
+- MCS_GROUP(2, 1, BW_20),
+- MCS_GROUP(3, 1, BW_20),
+ MCS_GROUP(1, 1, BW_20, 5),
+ MCS_GROUP(2, 1, BW_20, 4),
+ MCS_GROUP(3, 1, BW_20, 4),
-+
+
+- MCS_GROUP(1, 0, BW_40),
+- MCS_GROUP(2, 0, BW_40),
+- MCS_GROUP(3, 0, BW_40),
+ MCS_GROUP(1, 0, BW_40, 4),
+ MCS_GROUP(2, 0, BW_40, 4),
+ MCS_GROUP(3, 0, BW_40, 4),
-+
+
+- MCS_GROUP(1, 1, BW_40),
+- MCS_GROUP(2, 1, BW_40),
+- MCS_GROUP(3, 1, BW_40),
+ MCS_GROUP(1, 1, BW_40, 4),
+ MCS_GROUP(2, 1, BW_40, 4),
+ MCS_GROUP(3, 1, BW_40, 4),
-+
+
+- CCK_GROUP,
+ CCK_GROUP(8),
-+
+
+- VHT_GROUP(1, 0, BW_20),
+- VHT_GROUP(2, 0, BW_20),
+- VHT_GROUP(3, 0, BW_20),
+ VHT_GROUP(1, 0, BW_20, 5),
+ VHT_GROUP(2, 0, BW_20, 4),
+ VHT_GROUP(3, 0, BW_20, 4),
-+
+
+- VHT_GROUP(1, 1, BW_20),
+- VHT_GROUP(2, 1, BW_20),
+- VHT_GROUP(3, 1, BW_20),
+ VHT_GROUP(1, 1, BW_20, 5),
+ VHT_GROUP(2, 1, BW_20, 4),
+ VHT_GROUP(3, 1, BW_20, 4),
-+
+
+- VHT_GROUP(1, 0, BW_40),
+- VHT_GROUP(2, 0, BW_40),
+- VHT_GROUP(3, 0, BW_40),
+ VHT_GROUP(1, 0, BW_40, 4),
+ VHT_GROUP(2, 0, BW_40, 4),
+ VHT_GROUP(3, 0, BW_40, 4),
-+
+
+- VHT_GROUP(1, 1, BW_40),
+- VHT_GROUP(2, 1, BW_40),
+- VHT_GROUP(3, 1, BW_40),
+ VHT_GROUP(1, 1, BW_40, 4),
+ VHT_GROUP(2, 1, BW_40, 4),
+ VHT_GROUP(3, 1, BW_40, 4),
-+
+
+- VHT_GROUP(1, 0, BW_80),
+- VHT_GROUP(2, 0, BW_80),
+- VHT_GROUP(3, 0, BW_80),
+ VHT_GROUP(1, 0, BW_80, 4),
+ VHT_GROUP(2, 0, BW_80, 4),
+ VHT_GROUP(3, 0, BW_80, 4),
-+
+
+- VHT_GROUP(1, 1, BW_80),
+- VHT_GROUP(2, 1, BW_80),
+- VHT_GROUP(3, 1, BW_80),
+ VHT_GROUP(1, 1, BW_80, 4),
+ VHT_GROUP(2, 1, BW_80, 4),
+ VHT_GROUP(3, 1, BW_80, 4),
diff --git a/package/kernel/mac80211/patches/subsys/373-mac80211-minstrel-fix-using-short-preamble-CCK-rates.patch b/package/kernel/mac80211/patches/subsys/307-mac80211-minstrel-fix-using-short-preamble-CCK-rates.patch
index 502d8c7768..502d8c7768 100644
--- a/package/kernel/mac80211/patches/subsys/373-mac80211-minstrel-fix-using-short-preamble-CCK-rates.patch
+++ b/package/kernel/mac80211/patches/subsys/307-mac80211-minstrel-fix-using-short-preamble-CCK-rates.patch
diff --git a/package/kernel/mac80211/patches/subsys/375-mac80211-minstrel-fix-CCK-rate-group-streams-value.patch b/package/kernel/mac80211/patches/subsys/308-mac80211-minstrel-fix-CCK-rate-group-streams-value.patch
index f0ffcd9655..f0ffcd9655 100644
--- a/package/kernel/mac80211/patches/subsys/375-mac80211-minstrel-fix-CCK-rate-group-streams-value.patch
+++ b/package/kernel/mac80211/patches/subsys/308-mac80211-minstrel-fix-CCK-rate-group-streams-value.patch
diff --git a/package/kernel/mac80211/patches/subsys/376-mac80211-minstrel-fix-sampling-reporting-of-CCK-rate.patch b/package/kernel/mac80211/patches/subsys/309-mac80211-minstrel-fix-sampling-reporting-of-CCK-rate.patch
index e0049c36eb..e0049c36eb 100644
--- a/package/kernel/mac80211/patches/subsys/376-mac80211-minstrel-fix-sampling-reporting-of-CCK-rate.patch
+++ b/package/kernel/mac80211/patches/subsys/309-mac80211-minstrel-fix-sampling-reporting-of-CCK-rate.patch
diff --git a/package/kernel/mac80211/patches/subsys/377-mac80211-minstrel-do-not-sample-rates-3-times-slower.patch b/package/kernel/mac80211/patches/subsys/310-mac80211-minstrel-do-not-sample-rates-3-times-slower.patch
index 414cb137de..414cb137de 100644
--- a/package/kernel/mac80211/patches/subsys/377-mac80211-minstrel-do-not-sample-rates-3-times-slower.patch
+++ b/package/kernel/mac80211/patches/subsys/310-mac80211-minstrel-do-not-sample-rates-3-times-slower.patch
diff --git a/package/kernel/mac80211/patches/subsys/378-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch b/package/kernel/mac80211/patches/subsys/311-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch
index 4e83ff1ea0..1fd2b25271 100644
--- a/package/kernel/mac80211/patches/subsys/378-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch
+++ b/package/kernel/mac80211/patches/subsys/311-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch
@@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
-@@ -3194,6 +3194,7 @@ static bool ieee80211_amsdu_aggregate(st
+@@ -3185,6 +3185,7 @@ static bool ieee80211_amsdu_aggregate(st
u8 max_subframes = sta->sta.max_amsdu_subframes;
int max_frags = local->hw.max_tx_fragments;
int max_amsdu_len = sta->sta.max_amsdu_len;
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
__be16 len;
void *data;
bool ret = false;
-@@ -3225,12 +3226,13 @@ static bool ieee80211_amsdu_aggregate(st
+@@ -3216,12 +3217,13 @@ static bool ieee80211_amsdu_aggregate(st
flow = fq_flow_classify(fq, tin, skb, fq_flow_get_default_func);
head = skb_peek_tail(&flow->queue);
if (!head)
@@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
nfrags = 1 + skb_shinfo(skb)->nr_frags;
nfrags += 1 + skb_shinfo(head)->nr_frags;
-@@ -3288,6 +3290,9 @@ out_recalc:
+@@ -3279,6 +3281,9 @@ out_recalc:
fq_recalc_backlog(fq, tin, flow);
}
out:
diff --git a/package/kernel/mac80211/patches/subsys/383-mac80211-minstrel_ht-add-flag-to-indicate-missing-in.patch b/package/kernel/mac80211/patches/subsys/312-mac80211-minstrel_ht-add-flag-to-indicate-missing-in.patch
index 5b12e87c84..f221d36bf8 100644
--- a/package/kernel/mac80211/patches/subsys/383-mac80211-minstrel_ht-add-flag-to-indicate-missing-in.patch
+++ b/package/kernel/mac80211/patches/subsys/312-mac80211-minstrel_ht-add-flag-to-indicate-missing-in.patch
@@ -1,5 +1,5 @@
From: Felix Fietkau <nbd@nbd.name>
-Date: Wed, 16 Jan 2019 21:47:54 +0100
+Date: Wed, 16 Jan 2019 22:32:12 +0100
Subject: [PATCH] mac80211: minstrel_ht: add flag to indicate
missing/inaccurate tx A-MPDU length
@@ -9,13 +9,14 @@ to use a fixed value in its internal calculation (which gives better results
than just defaulting to 1).
Signed-off-by: Felix Fietkau <nbd@nbd.name>
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
-@@ -2134,6 +2134,9 @@ struct ieee80211_txq {
- * @IEEE80211_HW_NEEDS_ALIGNED4_SKBS: Driver need aligned skbs to four-byte.
- * Padding will be added after ieee80211_hdr, before IV/LLC.
+@@ -2131,6 +2131,9 @@ struct ieee80211_txq {
+ * @IEEE80211_HW_DOESNT_SUPPORT_QOS_NDP: The driver (or firmware) doesn't
+ * support QoS NDP for AP probing - that's most likely a driver bug.
*
+ * @IEEE80211_HW_TX_STATUS_NO_AMPDU_LEN: Driver does not report accurate A-MPDU
+ * length in tx status information
@@ -23,20 +24,20 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
* @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
*/
enum ieee80211_hw_flags {
-@@ -2180,6 +2183,7 @@ enum ieee80211_hw_flags {
+@@ -2176,6 +2179,7 @@ enum ieee80211_hw_flags {
+ IEEE80211_HW_SUPPORTS_TDLS_BUFFER_STA,
IEEE80211_HW_DEAUTH_NEED_MGD_TX_PREP,
IEEE80211_HW_DOESNT_SUPPORT_QOS_NDP,
- IEEE80211_HW_NEEDS_ALIGNED4_SKBS,
+ IEEE80211_HW_TX_STATUS_NO_AMPDU_LEN,
/* keep last, obviously */
NUM_IEEE80211_HW_FLAGS
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
-@@ -215,6 +215,7 @@ static const char *hw_flag_names[] = {
+@@ -214,6 +214,7 @@ static const char *hw_flag_names[] = {
+ FLAG(SUPPORTS_TDLS_BUFFER_STA),
FLAG(DEAUTH_NEED_MGD_TX_PREP),
FLAG(DOESNT_SUPPORT_QOS_NDP),
- FLAG(NEEDS_ALIGNED4_SKBS),
+ FLAG(TX_STATUS_NO_AMPDU_LEN),
#undef FLAG
};
diff --git a/package/kernel/mac80211/patches/subsys/357-mac80211-add-hdrlen-to-ieee80211_tx_data.patch b/package/kernel/mac80211/patches/subsys/350-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
index 2914461b41..0dfd0fbcfe 100644
--- a/package/kernel/mac80211/patches/subsys/357-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
+++ b/package/kernel/mac80211/patches/subsys/350-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
@@ -2,11 +2,11 @@ From: Janusz Dziedzic <janusz.dziedzic@tieto.com>
Date: Fri, 19 Feb 2016 11:01:49 +0100
Subject: [PATCH] mac80211: add hdrlen to ieee80211_tx_data
-Add hdrlen to ieee80211_tx_data and use this
-when wep/ccmd/tkip. This is preparation for
-aligned4 code.
+This is preparation for adding support for inserting padding between the
+802.11 header and LLC data
Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
--- a/net/mac80211/ieee80211_i.h
@@ -48,19 +48,28 @@ Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
if (likely(sta)) {
if (!IS_ERR(sta))
tx->sta = sta;
-@@ -3513,6 +3513,7 @@ begin:
+@@ -3518,6 +3518,7 @@ begin:
tx.local = local;
tx.skb = skb;
tx.sdata = vif_to_sdata(info->control.vif);
-+ tx.hdrlen = ieee80211_padded_hdrlen(hw, hdr->frame_control);
++ tx.hdrlen = ieee80211_hdrlen(hdr->frame_control);
if (txq->sta)
tx.sta = container_of(txq->sta, struct sta_info, sta);
-@@ -3850,6 +3851,7 @@ ieee80211_build_data_template(struct iee
+@@ -3544,7 +3545,7 @@ begin:
+
+ if (tx.key &&
+ (tx.key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV))
+- pn_offs = ieee80211_hdrlen(hdr->frame_control);
++ pn_offs = tx.hdrlen;
+
+ ieee80211_xmit_fast_finish(sta->sdata, sta, pn_offs,
+ tx.key, skb);
+@@ -3855,6 +3856,7 @@ ieee80211_build_data_template(struct iee
hdr = (void *)skb->data;
tx.sta = sta_info_get(sdata, hdr->addr1);
tx.skb = skb;
-+ tx.hdrlen = ieee80211_padded_hdrlen(&tx.local->hw, hdr->frame_control);
++ tx.hdrlen = ieee80211_hdrlen(hdr->frame_control);
if (ieee80211_tx_h_select_key(&tx) != TX_CONTINUE) {
rcu_read_unlock();
diff --git a/package/kernel/mac80211/patches/subsys/351-mac80211-add-TX_NEEDS_ALIGNED4_SKBS-hw-flag.patch b/package/kernel/mac80211/patches/subsys/351-mac80211-add-TX_NEEDS_ALIGNED4_SKBS-hw-flag.patch
new file mode 100644
index 0000000000..352246d592
--- /dev/null
+++ b/package/kernel/mac80211/patches/subsys/351-mac80211-add-TX_NEEDS_ALIGNED4_SKBS-hw-flag.patch
@@ -0,0 +1,304 @@
+From: Janusz Dziedzic <janusz.dziedzic@tieto.com>
+Date: Sun, 10 Mar 2019 17:22:08 +0100
+Subject: [PATCH] mac80211: add TX_NEEDS_ALIGNED4_SKBS hw flag
+
+The driver should set this flag if the hardware requires tx skb data
+(starting with the LLC header) to be aligned to 4 bytes.
+
+Padding is added after ieee80211_hdr, before IV/LLC.
+
+Before this patch, we have to do memmove(hdrlen) twice in the driver:
+Once before we pass this to HW and once again in tx completion
+(to fix up the skb for monitor mode).
+
+With this patch we can skip this memmove() and thus reduce CPU cycles in
+the data path.
+
+Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -2134,6 +2134,9 @@ struct ieee80211_txq {
+ * @IEEE80211_HW_TX_STATUS_NO_AMPDU_LEN: Driver does not report accurate A-MPDU
+ * length in tx status information
+ *
++ * @IEEE80211_HW_TX_NEEDS_ALIGNED4_SKBS: Driver need aligned skbs to four-byte.
++ * Padding will be added after ieee80211_hdr, before IV/LLC.
++ *
+ * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
+ */
+ enum ieee80211_hw_flags {
+@@ -2180,6 +2183,7 @@ enum ieee80211_hw_flags {
+ IEEE80211_HW_DEAUTH_NEED_MGD_TX_PREP,
+ IEEE80211_HW_DOESNT_SUPPORT_QOS_NDP,
+ IEEE80211_HW_TX_STATUS_NO_AMPDU_LEN,
++ IEEE80211_HW_TX_NEEDS_ALIGNED4_SKBS,
+
+ /* keep last, obviously */
+ NUM_IEEE80211_HW_FLAGS
+@@ -2462,6 +2466,40 @@ ieee80211_get_alt_retry_rate(const struc
+ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb);
+
+ /**
++ * ieee80211_hdr_padsize - get size of padding between 802.11 header and LLC
++ * @hw: the hardware
++ * @hdrlen: 802.11 header length
++ */
++static inline unsigned int
++ieee80211_hdr_padsize(struct ieee80211_hw *hw, unsigned int hdrlen)
++{
++ /*
++ * While hdrlen is already aligned to two-byte boundaries,
++ * simple check with & 2 will return correct padsize.
++ */
++ if (ieee80211_hw_check(hw, TX_NEEDS_ALIGNED4_SKBS))
++ return hdrlen & 2;
++ return 0;
++}
++
++/**
++ * ieee80211_padded_hdrlen - get padded 802.11 header size
++ * @hw: the hardware
++ * @fc: frame control field in little-endian format
++ */
++static inline unsigned int
++ieee80211_padded_hdrlen(struct ieee80211_hw *hw, __le16 fc)
++{
++ unsigned int hdrlen;
++
++ hdrlen = ieee80211_hdrlen(fc);
++ hdrlen += ieee80211_hdr_padsize(hw, hdrlen);
++
++ return hdrlen;
++}
++
++
++/**
+ * DOC: Hardware crypto acceleration
+ *
+ * mac80211 is capable of taking advantage of many hardware
+--- a/net/mac80211/iface.c
++++ b/net/mac80211/iface.c
+@@ -1871,6 +1871,10 @@ int ieee80211_if_add(struct ieee80211_lo
+ + 8 /* rfc1042/bridge tunnel */
+ - ETH_HLEN /* ethernet hard_header_len */
+ + IEEE80211_ENCRYPT_HEADROOM;
++
++ if (ieee80211_hw_check(&local->hw, TX_NEEDS_ALIGNED4_SKBS))
++ ndev->needed_headroom += 2; /* padding */
++
+ ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
+
+ ret = dev_alloc_name(ndev, ndev->name);
+--- a/net/mac80211/mesh_pathtbl.c
++++ b/net/mac80211/mesh_pathtbl.c
+@@ -103,13 +103,15 @@ void mesh_path_assign_nexthop(struct mes
+ static void prepare_for_gate(struct sk_buff *skb, char *dst_addr,
+ struct mesh_path *gate_mpath)
+ {
++ struct ieee80211_sub_if_data *sdata = gate_mpath->sdata;
++ struct ieee80211_hw *hw = &sdata->local->hw;
+ struct ieee80211_hdr *hdr;
+ struct ieee80211s_hdr *mshdr;
+ int mesh_hdrlen, hdrlen;
+ char *next_hop;
+
+ hdr = (struct ieee80211_hdr *) skb->data;
+- hdrlen = ieee80211_hdrlen(hdr->frame_control);
++ hdrlen = ieee80211_padded_hdrlen(hw, hdr->frame_control);
+ mshdr = (struct ieee80211s_hdr *) (skb->data + hdrlen);
+
+ if (!(mshdr->flags & MESH_FLAGS_AE)) {
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -2597,7 +2597,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80
+ struct ieee80211_local *local = rx->local;
+ struct ieee80211_sub_if_data *sdata = rx->sdata;
+ struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
+- u16 ac, q, hdrlen;
++ u16 ac, q, hdrlen, padsize;
+ int tailroom = 0;
+
+ hdr = (struct ieee80211_hdr *) skb->data;
+@@ -2688,7 +2688,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80
+ if (sdata->crypto_tx_tailroom_needed_cnt)
+ tailroom = IEEE80211_ENCRYPT_TAILROOM;
+
+- fwd_skb = skb_copy_expand(skb, local->tx_headroom +
++ padsize = ieee80211_hdr_padsize(&local->hw, hdrlen);
++
++ fwd_skb = skb_copy_expand(skb, local->tx_headroom + padsize +
+ sdata->encrypt_headroom,
+ tailroom, GFP_ATOMIC);
+ if (!fwd_skb)
+@@ -2720,6 +2722,12 @@ ieee80211_rx_h_mesh_fwding(struct ieee80
+ return RX_DROP_MONITOR;
+ }
+
++ if (padsize) {
++ skb_push(fwd_skb, padsize);
++ memmove(fwd_skb->data, skb->data + padsize, hdrlen);
++ memset(fwd_skb->data + hdrlen, 0, padsize);
++ }
++
+ IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, fwded_frames);
+ ieee80211_add_pending_skb(local, fwd_skb);
+ out:
+--- a/net/mac80211/sta_info.h
++++ b/net/mac80211/sta_info.h
+@@ -301,7 +301,7 @@ struct ieee80211_fast_tx {
+ u8 hdr_len;
+ u8 sa_offs, da_offs, pn_offs;
+ u8 band;
+- u8 hdr[30 + 2 + IEEE80211_FAST_XMIT_MAX_IV +
++ u8 hdr[30 + 2 + 2 + IEEE80211_FAST_XMIT_MAX_IV +
+ sizeof(rfc1042_header)] __aligned(2);
+
+ struct rcu_head rcu_head;
+--- a/net/mac80211/status.c
++++ b/net/mac80211/status.c
+@@ -515,6 +515,7 @@ static void ieee80211_report_used_skb(st
+ {
+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+ struct ieee80211_hdr *hdr = (void *)skb->data;
++ struct ieee80211_hw *hw = &local->hw;
+ bool acked = info->flags & IEEE80211_TX_STAT_ACK;
+
+ if (dropped)
+@@ -531,7 +532,7 @@ static void ieee80211_report_used_skb(st
+ skb->dev = NULL;
+ } else {
+ unsigned int hdr_size =
+- ieee80211_hdrlen(hdr->frame_control);
++ ieee80211_padded_hdrlen(hw, hdr->frame_control);
+
+ /* Check to see if packet is a TDLS teardown packet */
+ if (ieee80211_is_data(hdr->frame_control) &&
+@@ -655,9 +656,22 @@ void ieee80211_tx_monitor(struct ieee802
+ struct sk_buff *skb2;
+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+ struct ieee80211_sub_if_data *sdata;
++ struct ieee80211_hdr *hdr = (void *)skb->data;
+ struct net_device *prev_dev = NULL;
++ unsigned int hdrlen, padsize;
+ int rtap_len;
+
++ /* Remove padding if was added */
++ if (ieee80211_hw_check(&local->hw, TX_NEEDS_ALIGNED4_SKBS)) {
++ hdrlen = ieee80211_hdrlen(hdr->frame_control);
++ padsize = ieee80211_hdr_padsize(&local->hw, hdrlen);
++
++ if (padsize && skb->len > hdrlen + padsize) {
++ memmove(skb->data + padsize, skb->data, hdrlen);
++ skb_pull(skb, padsize);
++ }
++ }
++
+ /* send frame to monitor interfaces now */
+ rtap_len = ieee80211_tx_radiotap_len(info);
+ if (WARN_ON_ONCE(skb_headroom(skb) < rtap_len)) {
+--- a/net/mac80211/tkip.c
++++ b/net/mac80211/tkip.c
+@@ -201,10 +201,12 @@ void ieee80211_get_tkip_p2k(struct ieee8
+ {
+ struct ieee80211_key *key = (struct ieee80211_key *)
+ container_of(keyconf, struct ieee80211_key, conf);
++ struct ieee80211_hw *hw = &key->local->hw;
+ const u8 *tk = &key->conf.key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY];
+ struct tkip_ctx *ctx = &key->u.tkip.tx;
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+- const u8 *data = (u8 *)hdr + ieee80211_hdrlen(hdr->frame_control);
++ const u8 *data = (u8 *)hdr + ieee80211_padded_hdrlen(hw,
++ hdr->frame_control);
+ u32 iv32 = get_unaligned_le32(&data[4]);
+ u16 iv16 = data[2] | (data[0] << 8);
+
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -1175,8 +1175,7 @@ ieee80211_tx_prepare(struct ieee80211_su
+ info->flags &= ~IEEE80211_TX_INTFL_NEED_TXPROCESSING;
+
+ hdr = (struct ieee80211_hdr *) skb->data;
+-
+- tx->hdrlen = ieee80211_hdrlen(hdr->frame_control);
++ tx->hdrlen = ieee80211_padded_hdrlen(&local->hw, hdr->frame_control);
+
+ if (likely(sta)) {
+ if (!IS_ERR(sta))
+@@ -2215,7 +2214,7 @@ netdev_tx_t ieee80211_monitor_start_xmit
+ goto fail;
+
+ hdr = (struct ieee80211_hdr *)(skb->data + len_rthdr);
+- hdrlen = ieee80211_hdrlen(hdr->frame_control);
++ hdrlen = ieee80211_padded_hdrlen(&local->hw, hdr->frame_control);
+
+ if (skb->len < len_rthdr + hdrlen)
+ goto fail;
+@@ -2433,7 +2432,7 @@ static struct sk_buff *ieee80211_build_h
+ struct ieee80211_chanctx_conf *chanctx_conf;
+ struct ieee80211_sub_if_data *ap_sdata;
+ enum nl80211_band band;
+- int ret;
++ int padsize, ret;
+
+ if (IS_ERR(sta))
+ sta = NULL;
+@@ -2732,7 +2731,9 @@ static struct sk_buff *ieee80211_build_h
+ }
+
+ skb_pull(skb, skip_header_bytes);
++ padsize = ieee80211_hdr_padsize(&local->hw, hdrlen);
+ head_need = hdrlen + encaps_len + meshhdrlen - skb_headroom(skb);
++ head_need += padsize;
+
+ /*
+ * So we need to modify the skb header and hence need a copy of
+@@ -2765,6 +2766,9 @@ static struct sk_buff *ieee80211_build_h
+ memcpy(skb_push(skb, meshhdrlen), &mesh_hdr, meshhdrlen);
+ #endif
+
++ if (padsize)
++ memset(skb_push(skb, padsize), 0, padsize);
++
+ if (ieee80211_is_data_qos(fc)) {
+ __le16 *qos_control;
+
+@@ -2940,6 +2944,8 @@ void ieee80211_check_fast_xmit(struct st
+ fc |= cpu_to_le16(IEEE80211_STYPE_QOS_DATA);
+ }
+
++ build.hdr_len += ieee80211_hdr_padsize(&local->hw, build.hdr_len);
++
+ /* We store the key here so there's no point in using rcu_dereference()
+ * but that's fine because the code that changes the pointers will call
+ * this function after doing so. For a single CPU that would be enough,
+@@ -3518,7 +3524,7 @@ begin:
+ tx.local = local;
+ tx.skb = skb;
+ tx.sdata = vif_to_sdata(info->control.vif);
+- tx.hdrlen = ieee80211_hdrlen(hdr->frame_control);
++ tx.hdrlen = ieee80211_padded_hdrlen(hw, hdr->frame_control);
+
+ if (txq->sta)
+ tx.sta = container_of(txq->sta, struct sta_info, sta);
+@@ -3856,7 +3862,7 @@ ieee80211_build_data_template(struct iee
+ hdr = (void *)skb->data;
+ tx.sta = sta_info_get(sdata, hdr->addr1);
+ tx.skb = skb;
+- tx.hdrlen = ieee80211_hdrlen(hdr->frame_control);
++ tx.hdrlen = ieee80211_padded_hdrlen(&tx.local->hw, hdr->frame_control);
+
+ if (ieee80211_tx_h_select_key(&tx) != TX_CONTINUE) {
+ rcu_read_unlock();
+--- a/net/mac80211/debugfs.c
++++ b/net/mac80211/debugfs.c
+@@ -215,6 +215,7 @@ static const char *hw_flag_names[] = {
+ FLAG(DEAUTH_NEED_MGD_TX_PREP),
+ FLAG(DOESNT_SUPPORT_QOS_NDP),
+ FLAG(TX_STATUS_NO_AMPDU_LEN),
++ FLAG(TX_NEEDS_ALIGNED4_SKBS),
+ #undef FLAG
+ };
+
diff --git a/package/kernel/mac80211/patches/subsys/358-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch b/package/kernel/mac80211/patches/subsys/358-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch
deleted file mode 100644
index f4048b0420..0000000000
--- a/package/kernel/mac80211/patches/subsys/358-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-From: Janusz Dziedzic <janusz.dziedzic@tieto.com>
-Date: Fri, 19 Feb 2016 11:01:50 +0100
-Subject: [PATCH] mac80211: add NEED_ALIGNED4_SKBS hw flag
-
-HW/driver should set NEED_ALIGNED4_SKBS flag in case
-require aligned skbs to four-byte boundaries.
-This affect only TX direction.
-
-Padding is added after ieee80211_hdr, before IV/LLC.
-
-Before we have to do memmove(hdrlen) twice in the
-dirver. Once before we pass this to HW and next
-in tx completion (to be sure monitor will report
-this tx frame correctly).
-
-With this patch we can skip this memmove() and save CPU.
-
-Currently this was tested with ath9k, both hw/sw crypt for
-wep/tkip/ccmp.
-
-Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
----
-
---- a/include/net/mac80211.h
-+++ b/include/net/mac80211.h
-@@ -2131,6 +2131,9 @@ struct ieee80211_txq {
- * @IEEE80211_HW_DOESNT_SUPPORT_QOS_NDP: The driver (or firmware) doesn't
- * support QoS NDP for AP probing - that's most likely a driver bug.
- *
-+ * @IEEE80211_HW_NEEDS_ALIGNED4_SKBS: Driver need aligned skbs to four-byte.
-+ * Padding will be added after ieee80211_hdr, before IV/LLC.
-+ *
- * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
- */
- enum ieee80211_hw_flags {
-@@ -2176,6 +2179,7 @@ enum ieee80211_hw_flags {
- IEEE80211_HW_SUPPORTS_TDLS_BUFFER_STA,
- IEEE80211_HW_DEAUTH_NEED_MGD_TX_PREP,
- IEEE80211_HW_DOESNT_SUPPORT_QOS_NDP,
-+ IEEE80211_HW_NEEDS_ALIGNED4_SKBS,
-
- /* keep last, obviously */
- NUM_IEEE80211_HW_FLAGS
---- a/net/mac80211/debugfs.c
-+++ b/net/mac80211/debugfs.c
-@@ -214,6 +214,7 @@ static const char *hw_flag_names[] = {
- FLAG(SUPPORTS_TDLS_BUFFER_STA),
- FLAG(DEAUTH_NEED_MGD_TX_PREP),
- FLAG(DOESNT_SUPPORT_QOS_NDP),
-+ FLAG(NEEDS_ALIGNED4_SKBS),
- #undef FLAG
- };
-
---- a/net/mac80211/ieee80211_i.h
-+++ b/net/mac80211/ieee80211_i.h
-@@ -1559,6 +1559,29 @@ ieee80211_vif_get_num_mcast_if(struct ie
- return -1;
- }
-
-+static inline unsigned int
-+ieee80211_hdr_padsize(struct ieee80211_hw *hw, unsigned int hdrlen)
-+{
-+ /*
-+ * While hdrlen is already aligned to two-byte boundaries,
-+ * simple check with & 2 will return correct padsize.
-+ */
-+ if (ieee80211_hw_check(hw, NEEDS_ALIGNED4_SKBS))
-+ return hdrlen & 2;
-+ return 0;
-+}
-+
-+static inline unsigned int
-+ieee80211_padded_hdrlen(struct ieee80211_hw *hw, __le16 fc)
-+{
-+ unsigned int hdrlen;
-+
-+ hdrlen = ieee80211_hdrlen(fc);
-+ hdrlen += ieee80211_hdr_padsize(hw, hdrlen);
-+
-+ return hdrlen;
-+}
-+
- u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
- struct ieee80211_rx_status *status,
- unsigned int mpdu_len,
---- a/net/mac80211/sta_info.h
-+++ b/net/mac80211/sta_info.h
-@@ -301,7 +301,7 @@ struct ieee80211_fast_tx {
- u8 hdr_len;
- u8 sa_offs, da_offs, pn_offs;
- u8 band;
-- u8 hdr[30 + 2 + IEEE80211_FAST_XMIT_MAX_IV +
-+ u8 hdr[30 + 2 + 2 + IEEE80211_FAST_XMIT_MAX_IV +
- sizeof(rfc1042_header)] __aligned(2);
-
- struct rcu_head rcu_head;
---- a/net/mac80211/status.c
-+++ b/net/mac80211/status.c
-@@ -655,9 +655,22 @@ void ieee80211_tx_monitor(struct ieee802
- struct sk_buff *skb2;
- struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
- struct ieee80211_sub_if_data *sdata;
-+ struct ieee80211_hdr *hdr = (void *)skb->data;
- struct net_device *prev_dev = NULL;
-+ unsigned int hdrlen, padsize;
- int rtap_len;
-
-+ /* Remove padding if was added */
-+ if (ieee80211_hw_check(&local->hw, NEEDS_ALIGNED4_SKBS)) {
-+ hdrlen = ieee80211_hdrlen(hdr->frame_control);
-+ padsize = ieee80211_hdr_padsize(&local->hw, hdrlen);
-+
-+ if (padsize && skb->len > hdrlen + padsize) {
-+ memmove(skb->data + padsize, skb->data, hdrlen);
-+ skb_pull(skb, padsize);
-+ }
-+ }
-+
- /* send frame to monitor interfaces now */
- rtap_len = ieee80211_tx_radiotap_len(info);
- if (WARN_ON_ONCE(skb_headroom(skb) < rtap_len)) {
---- a/net/mac80211/tkip.c
-+++ b/net/mac80211/tkip.c
-@@ -201,10 +201,12 @@ void ieee80211_get_tkip_p2k(struct ieee8
- {
- struct ieee80211_key *key = (struct ieee80211_key *)
- container_of(keyconf, struct ieee80211_key, conf);
-+ struct ieee80211_hw *hw = &key->local->hw;
- const u8 *tk = &key->conf.key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY];
- struct tkip_ctx *ctx = &key->u.tkip.tx;
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-- const u8 *data = (u8 *)hdr + ieee80211_hdrlen(hdr->frame_control);
-+ const u8 *data = (u8 *)hdr + ieee80211_padded_hdrlen(hw,
-+ hdr->frame_control);
- u32 iv32 = get_unaligned_le32(&data[4]);
- u16 iv16 = data[2] | (data[0] << 8);
-
---- a/net/mac80211/tx.c
-+++ b/net/mac80211/tx.c
-@@ -1175,8 +1175,7 @@ ieee80211_tx_prepare(struct ieee80211_su
- info->flags &= ~IEEE80211_TX_INTFL_NEED_TXPROCESSING;
-
- hdr = (struct ieee80211_hdr *) skb->data;
--
-- tx->hdrlen = ieee80211_hdrlen(hdr->frame_control);
-+ tx->hdrlen = ieee80211_padded_hdrlen(&local->hw, hdr->frame_control);
-
- if (likely(sta)) {
- if (!IS_ERR(sta))
-@@ -2215,7 +2214,7 @@ netdev_tx_t ieee80211_monitor_start_xmit
- goto fail;
-
- hdr = (struct ieee80211_hdr *)(skb->data + len_rthdr);
-- hdrlen = ieee80211_hdrlen(hdr->frame_control);
-+ hdrlen = ieee80211_padded_hdrlen(&local->hw, hdr->frame_control);
-
- if (skb->len < len_rthdr + hdrlen)
- goto fail;
-@@ -2433,7 +2432,7 @@ static struct sk_buff *ieee80211_build_h
- struct ieee80211_chanctx_conf *chanctx_conf;
- struct ieee80211_sub_if_data *ap_sdata;
- enum nl80211_band band;
-- int ret;
-+ int padsize, ret;
-
- if (IS_ERR(sta))
- sta = NULL;
-@@ -2653,6 +2652,9 @@ static struct sk_buff *ieee80211_build_h
- hdrlen += 2;
- }
-
-+ /* Check aligned4 skb required */
-+ padsize = ieee80211_hdr_padsize(&sdata->local->hw, hdrlen);
-+
- /*
- * Drop unicast frames to unauthorised stations unless they are
- * EAPOL frames from the local station.
-@@ -2733,6 +2735,7 @@ static struct sk_buff *ieee80211_build_h
-
- skb_pull(skb, skip_header_bytes);
- head_need = hdrlen + encaps_len + meshhdrlen - skb_headroom(skb);
-+ head_need += padsize;
-
- /*
- * So we need to modify the skb header and hence need a copy of
-@@ -2765,6 +2768,9 @@ static struct sk_buff *ieee80211_build_h
- memcpy(skb_push(skb, meshhdrlen), &mesh_hdr, meshhdrlen);
- #endif
-
-+ if (padsize)
-+ memset(skb_push(skb, padsize), 0, padsize);
-+
- if (ieee80211_is_data_qos(fc)) {
- __le16 *qos_control;
-
-@@ -2940,6 +2946,9 @@ void ieee80211_check_fast_xmit(struct st
- fc |= cpu_to_le16(IEEE80211_STYPE_QOS_DATA);
- }
-
-+ /* Check aligned4 skb required */
-+ build.hdr_len += ieee80211_hdr_padsize(&local->hw, build.hdr_len);
-+
- /* We store the key here so there's no point in using rcu_dereference()
- * but that's fine because the code that changes the pointers will call
- * this function after doing so. For a single CPU that would be enough,
-@@ -3540,7 +3549,7 @@ begin:
-
- if (tx.key &&
- (tx.key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV))
-- pn_offs = ieee80211_hdrlen(hdr->frame_control);
-+ pn_offs = tx.hdrlen;
-
- ieee80211_xmit_fast_finish(sta->sdata, sta, pn_offs,
- tx.key, skb);
---- a/net/mac80211/util.c
-+++ b/net/mac80211/util.c
-@@ -1388,6 +1388,7 @@ void ieee80211_send_auth(struct ieee8021
- u32 tx_flags)
- {
- struct ieee80211_local *local = sdata->local;
-+ struct ieee80211_hw *hw = &local->hw;
- struct sk_buff *skb;
- struct ieee80211_mgmt *mgmt;
- unsigned int hdrlen;
-@@ -1414,7 +1415,7 @@ void ieee80211_send_auth(struct ieee8021
- skb_put_data(skb, extra, extra_len);
-
- if (auth_alg == WLAN_AUTH_SHARED_KEY && transaction == 3) {
-- hdrlen = ieee80211_hdrlen(mgmt->frame_control);
-+ hdrlen = ieee80211_padded_hdrlen(hw, mgmt->frame_control);
- mgmt->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
- err = ieee80211_wep_encrypt(local, skb, hdrlen, key,
- key_len, key_idx);
diff --git a/package/kernel/mac80211/patches/subsys/390-nl-mac-80211-allow-4addr-AP-operation-on-crypto-cont.patch b/package/kernel/mac80211/patches/subsys/390-nl-mac-80211-allow-4addr-AP-operation-on-crypto-cont.patch
index 3f933f8c3b..70670b3ebf 100644
--- a/package/kernel/mac80211/patches/subsys/390-nl-mac-80211-allow-4addr-AP-operation-on-crypto-cont.patch
+++ b/package/kernel/mac80211/patches/subsys/390-nl-mac-80211-allow-4addr-AP-operation-on-crypto-cont.patch
@@ -50,7 +50,7 @@ Signed-off-by: Manikanta Pubbisetty <mpubbise@codeaurora.org>
* control port protocol ethertype. The device also honours the
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
-@@ -3523,7 +3523,9 @@ int ieee80211_check_combinations(struct
+@@ -3622,7 +3622,9 @@ int ieee80211_check_combinations(struct
}
/* Always allow software iftypes */