From: Felix Fietkau <nbd@nbd.name>
Date: Mon, 12 Sep 2016 09:25:20 +0000 (+0200)
Subject: mac80211: fix tx issue with CCMP PN generated in hardware
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f3747020e202883a43729fc245986f9e36289d6c;p=openwrt%2Fstaging%2Fblogic.git

mac80211: fix tx issue with CCMP PN generated in hardware

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/kernel/mac80211/patches/346-mac80211-Move-reorder-sensitive-TX-handlers-to-after.patch b/package/kernel/mac80211/patches/346-mac80211-Move-reorder-sensitive-TX-handlers-to-after.patch
index 8ceed5195da1..aba1ff45322d 100644
--- a/package/kernel/mac80211/patches/346-mac80211-Move-reorder-sensitive-TX-handlers-to-after.patch
+++ b/package/kernel/mac80211/patches/346-mac80211-Move-reorder-sensitive-TX-handlers-to-after.patch
@@ -404,7 +404,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	sta->tx_stats.packets[skb_get_queue_mapping(skb)]++;
  
 -	if (fast_tx->pn_offs) {
-+	if (pn_offs) {
++	if (pn_offs && (key_conf->flags & IEEE80211_KEY_FLAG_GENERATE_IV)) {
  		u64 pn;
 -		u8 *crypto_hdr = skb->data + fast_tx->pn_offs;
 +		u8 *crypto_hdr = skb->data + pn_offs;