[source] mac80211: fix a minor issue in the header padding patch

LEDE Commits lede-commits at lists.infradead.org
Thu Nov 3 03:05:13 PDT 2016


nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/69ace0824f13b64b51b4e8e9e39e3df560c53594

commit 69ace0824f13b64b51b4e8e9e39e3df560c53594
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Wed Nov 2 11:43:12 2016 +0100

    mac80211: fix a minor issue in the header padding patch
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 .../patches/305-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch    | 9 +++++++++
 1 file changed, 9 insertions(+)

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 508cc92..704e7f7 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 at 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



More information about the lede-commits mailing list