aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-11-02 11:43:12 +0100
committerFelix Fietkau <nbd@nbd.name>2016-11-03 11:04:54 +0100
commit69ace0824f13b64b51b4e8e9e39e3df560c53594 (patch)
tree0ace1504be39a8ead7c77ab4056b055627b29032 /package/kernel/mac80211
parent4dfc0be07b85d62028175c1406ca585a3c5a0834 (diff)
downloadupstream-69ace0824f13b64b51b4e8e9e39e3df560c53594.tar.gz
upstream-69ace0824f13b64b51b4e8e9e39e3df560c53594.tar.bz2
upstream-69ace0824f13b64b51b4e8e9e39e3df560c53594.zip
mac80211: fix a minor issue in the header padding patch
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211')
-rw-r--r--package/kernel/mac80211/patches/305-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch9
1 files changed, 9 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/305-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch b/package/kernel/mac80211/patches/305-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch
index 508cc92411..704e7f7815 100644
--- a/package/kernel/mac80211/patches/305-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch
+++ b/package/kernel/mac80211/patches/305-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch
@@ -203,6 +203,15 @@ Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
/* 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,
+@@ -3436,7 +3445,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
@@ -1225,6 +1225,7 @@ void ieee80211_send_auth(struct ieee8021