mac80211: Refresh patches again

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / subsys / 313-mac80211-fix-encryption-key-selection-for-802.3-xmit.patch

diff --git a/package/kernel/mac80211/patches/subsys/313-mac80211-fix-encryption-key-selection-for-802.3-xmit.patch b/package/kernel/mac80211/patches/subsys/313-mac80211-fix-encryption-key-selection-for-802.3-xmit.patch
index 5ae9ca8b933c5b320574d20f901f05110ed3ea2a..9c9be2927a88b9bafb1e6e4af4947d7823ee1ae4 100644 (file)
--- a/package/kernel/mac80211/patches/subsys/313-mac80211-fix-encryption-key-selection-for-802.3-xmit.patch
+++ b/package/kernel/mac80211/patches/subsys/313-mac80211-fix-encryption-key-selection-for-802.3-xmit.patch
@@ -28,13 +28,14 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 -               (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) ||
 -                key->conf.cipher == WLAN_CIPHER_SUITE_TKIP))
 -              offload = false;
-+          sdata->control_port_protocol == ehdr->h_proto))
-+              goto skip_offload;
- 
+-
 -      if (offload)
 -              ieee80211_8023_xmit(sdata, dev, sta, key, skb);
 -      else
 -              ieee80211_subif_start_xmit(skb, dev);
++          sdata->control_port_protocol == ehdr->h_proto))
++              goto skip_offload;
+ 
 +      key = rcu_dereference(sta->ptk[sta->ptk_idx]);
 +      if (!key)
 +              key = rcu_dereference(sdata->default_unicast_key);
@@ -45,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +
 +      ieee80211_8023_xmit(sdata, dev, sta, key, skb);
 +      goto out;
- 
++
 +skip_offload:
 +      ieee80211_subif_start_xmit(skb, dev);
  out: