diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-02-15 22:23:17 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-02-15 22:29:42 +0100 |
| commit | 0cde9a0a6527b7ad97a72cb0641566c307c861a4 (patch) | |
| tree | 3ad3408f39f9e38ad4392c5c58451957856083f8 /package/kernel/mac80211/patches/subsys/313-mac80211-fix-encryption-key-selection-for-802.3-xmit.patch | |
| parent | f0933303d685f2f1b4146f6d23ae18c66cbf6c01 (diff) | |
| download | upstream-0cde9a0a6527b7ad97a72cb0641566c307c861a4.tar.gz upstream-0cde9a0a6527b7ad97a72cb0641566c307c861a4.tar.bz2 upstream-0cde9a0a6527b7ad97a72cb0641566c307c861a4.zip | |
mac80211: Refresh patches again
A wrong quilt configuration was used last time.
Fixes: ed1e234d87fc ("mac80211: refresh patches")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/subsys/313-mac80211-fix-encryption-key-selection-for-802.3-xmit.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/subsys/313-mac80211-fix-encryption-key-selection-for-802.3-xmit.patch | 9 |
1 files changed, 5 insertions, 4 deletions
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 5ae9ca8b93..9c9be2927a 100644 --- 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: |