mac80211: fix a minor issue in the header padding patch
authorFelix Fietkau <nbd@nbd.name>
Wed, 2 Nov 2016 10:43:12 +0000 (11:43 +0100)
committerFelix Fietkau <nbd@nbd.name>
Thu, 3 Nov 2016 10:04:54 +0000 (11:04 +0100)
Signed-off-by: Felix Fietkau <nbd@nbd.name>
package/kernel/mac80211/patches/305-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch

index 508cc924117a063458bb6fb64f659b0bc0633f9e..704e7f781594bd2ccb999dc3b0f411a19c00d8d8 100644 (file)
@@ -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