mac80211: fix a minor issue in the header padding patch

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-11-02 11:43:12 +01:00
parent 4dfc0be07b
commit 69ace0824f

View 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() /* 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 * 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, * 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 --- a/net/mac80211/util.c
+++ b/net/mac80211/util.c +++ b/net/mac80211/util.c
@@ -1225,6 +1225,7 @@ void ieee80211_send_auth(struct ieee8021 @@ -1225,6 +1225,7 @@ void ieee80211_send_auth(struct ieee8021