diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-11-07 17:50:20 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-02-14 15:13:40 +0100 |
commit | bf6f7cf29bdbf1fcd1176184d759d2a51a17b730 (patch) | |
tree | 9bbf079a2cf5c20b44217b8ad30eaf4a650e445b /package/kernel/mac80211/patches/subsys/317-mac80211-set-info-control.hw_key-for-encap-offload-p.patch | |
parent | 1caa81e505a1da0ebd70351996e382fa9dafaa8d (diff) | |
download | upstream-bf6f7cf29bdbf1fcd1176184d759d2a51a17b730.tar.gz upstream-bf6f7cf29bdbf1fcd1176184d759d2a51a17b730.tar.bz2 upstream-bf6f7cf29bdbf1fcd1176184d759d2a51a17b730.zip |
mac80211: Update to version 5.9.12-1
The removed patches were applied upstream.
Remove the 300-mac80211-optimize-skb-resizing.patch.
This patch was not applied upstream, but it conflicts with upstream
changes and needs bigger changes. It was applied with Felix to remove
this patch for now. It should be reworked and then send upstream later.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/subsys/317-mac80211-set-info-control.hw_key-for-encap-offload-p.patch')
-rw-r--r-- | package/kernel/mac80211/patches/subsys/317-mac80211-set-info-control.hw_key-for-encap-offload-p.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/subsys/317-mac80211-set-info-control.hw_key-for-encap-offload-p.patch b/package/kernel/mac80211/patches/subsys/317-mac80211-set-info-control.hw_key-for-encap-offload-p.patch index cb5a986312..077a82d5ee 100644 --- a/package/kernel/mac80211/patches/subsys/317-mac80211-set-info-control.hw_key-for-encap-offload-p.patch +++ b/package/kernel/mac80211/patches/subsys/317-mac80211-set-info-control.hw_key-for-encap-offload-p.patch @@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4185,6 +4185,7 @@ static void ieee80211_8023_xmit(struct i +@@ -4182,6 +4182,7 @@ static void ieee80211_8023_xmit(struct i { struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_local *local = sdata->local; @@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> struct tid_ampdu_tx *tid_tx; u8 tid; -@@ -4233,6 +4234,10 @@ static void ieee80211_8023_xmit(struct i +@@ -4230,6 +4231,10 @@ static void ieee80211_8023_xmit(struct i info->control.flags |= IEEE80211_TX_CTRL_HW_80211_ENCAP; info->control.vif = &sdata->vif; |