mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-15 18:03:30 +00:00

kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350) 431fb8c mac80211: add AQL improvements 6bdd4c9 mac80211: add missing backports for building with 4.14 kernels 0106820 mac80211: add missing return code checks in AQL improvements e7f7101 mac80211: rework encapsulation offload support [package] base-files: add function for generating random MAC dnsmasq: abort dhcp_check on interface state boot: sync upstream source code ath10k-ct-firmware/mt76/sch_cake: update to latest git HEAD [script] download: add China Mirror Station [target] Sync: arc770, ath79, bcm63xx, kirkwood, lantiq, layerscape, mediatek, mvebu, octeon, oxnas, pistachio, uml Sync most of the target patches. Run-compiled-on: ipq40xx (4.19 & 5.4), ramips
32 lines
880 B
Diff
32 lines
880 B
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Fri, 21 Aug 2020 06:03:45 +0200
|
|
Subject: [PATCH] mac80211: set info->control.hw_key for encap offload
|
|
packets
|
|
|
|
This is needed for drivers that don't do the key lookup themselves
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/net/mac80211/tx.c
|
|
+++ b/net/mac80211/tx.c
|
|
@@ -4191,6 +4191,7 @@ static void ieee80211_8023_xmit(struct i
|
|
{
|
|
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
|
|
struct ieee80211_local *local = sdata->local;
|
|
+ struct ieee80211_key *key;
|
|
struct tid_ampdu_tx *tid_tx;
|
|
u8 tid;
|
|
|
|
@@ -4239,6 +4240,10 @@ static void ieee80211_8023_xmit(struct i
|
|
info->flags |= IEEE80211_TX_CTL_HW_80211_ENCAP;
|
|
info->control.vif = &sdata->vif;
|
|
|
|
+ key = rcu_dereference(sta->ptk[sta->ptk_idx]);
|
|
+ if (key)
|
|
+ info->control.hw_key = &key->conf;
|
|
+
|
|
ieee80211_tx_8023(sdata, skb, skb->len, sta, false);
|
|
|
|
return;
|