aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/334-v4.17-mac80211-support-station-4-addr-mode-fast-rx.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2018-03-01 12:32:07 +0100
committerRafał Miłecki <rafal@milecki.pl>2018-03-01 13:54:42 +0100
commita186c2ab70d3980d3da502da7e08fb3644104815 (patch)
tree4c00b46da24fe52afb56e50d45b6d312408bf7fb /package/kernel/mac80211/patches/334-v4.17-mac80211-support-station-4-addr-mode-fast-rx.patch
parent2389ebbd48d2073609b6acff9a3507b1daa36e36 (diff)
downloadupstream-a186c2ab70d3980d3da502da7e08fb3644104815.tar.gz
upstream-a186c2ab70d3980d3da502da7e08fb3644104815.tar.bz2
upstream-a186c2ab70d3980d3da502da7e08fb3644104815.zip
mac80211: rename patches accepted upstream
This is to simplify maintenance. It's easy to say now which patches need some extra work and/or sending upstream. Updating to newer backports should be also simpler with this. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'package/kernel/mac80211/patches/334-v4.17-mac80211-support-station-4-addr-mode-fast-rx.patch')
-rw-r--r--package/kernel/mac80211/patches/334-v4.17-mac80211-support-station-4-addr-mode-fast-rx.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/334-v4.17-mac80211-support-station-4-addr-mode-fast-rx.patch b/package/kernel/mac80211/patches/334-v4.17-mac80211-support-station-4-addr-mode-fast-rx.patch
new file mode 100644
index 0000000000..97a5d8beba
--- /dev/null
+++ b/package/kernel/mac80211/patches/334-v4.17-mac80211-support-station-4-addr-mode-fast-rx.patch
@@ -0,0 +1,34 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Fri, 23 Feb 2018 10:05:08 +0100
+Subject: [PATCH] mac80211: support station 4-addr mode fast-rx
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -3738,10 +3738,6 @@ void ieee80211_check_fast_rx(struct sta_
+
+ switch (sdata->vif.type) {
+ case NL80211_IFTYPE_STATION:
+- /* 4-addr is harder to deal with, later maybe */
+- if (sdata->u.mgd.use_4addr)
+- goto clear;
+-
+ if (sta->sta.tdls) {
+ fastrx.da_offs = offsetof(struct ieee80211_hdr, addr1);
+ fastrx.sa_offs = offsetof(struct ieee80211_hdr, addr2);
+@@ -3754,6 +3750,13 @@ void ieee80211_check_fast_rx(struct sta_
+ cpu_to_le16(IEEE80211_FCTL_FROMDS);
+ }
+
++ if (sdata->u.mgd.use_4addr && !sta->sta.tdls) {
++ fastrx.expected_ds_bits |=
++ cpu_to_le16(IEEE80211_FCTL_TODS);
++ fastrx.da_offs = offsetof(struct ieee80211_hdr, addr3);
++ fastrx.sa_offs = offsetof(struct ieee80211_hdr, addr4);
++ }
++
+ if (!sdata->u.mgd.powersave)
+ break;
+