From bf6f7cf29bdbf1fcd1176184d759d2a51a17b730 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 7 Nov 2020 17:50:20 +0100 Subject: 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 --- .../325-mac80211-extend-ieee80211_tx_status_ext-to-support-b.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/kernel/mac80211/patches/subsys/325-mac80211-extend-ieee80211_tx_status_ext-to-support-b.patch') diff --git a/package/kernel/mac80211/patches/subsys/325-mac80211-extend-ieee80211_tx_status_ext-to-support-b.patch b/package/kernel/mac80211/patches/subsys/325-mac80211-extend-ieee80211_tx_status_ext-to-support-b.patch index e8b29bb4c5..b5dcb0b013 100644 --- a/package/kernel/mac80211/patches/subsys/325-mac80211-extend-ieee80211_tx_status_ext-to-support-b.patch +++ b/package/kernel/mac80211/patches/subsys/325-mac80211-extend-ieee80211_tx_status_ext-to-support-b.patch @@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -1092,12 +1092,14 @@ ieee80211_info_get_tx_time_est(struct ie +@@ -1095,12 +1095,14 @@ ieee80211_info_get_tx_time_est(struct ie * @info: Basic tx status information * @skb: Packet skb (can be NULL if not provided by the driver) * @rate: The TX rate that was used when sending the packet @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau /** --- a/net/mac80211/status.c +++ b/net/mac80211/status.c -@@ -1053,7 +1053,10 @@ static void __ieee80211_tx_status(struct +@@ -1051,7 +1051,10 @@ static void __ieee80211_tx_status(struct * with this test... */ if (!local->monitors && (!send_to_cooked || !local->cooked_mntrs)) { @@ -39,7 +39,7 @@ Signed-off-by: Felix Fietkau return; } -@@ -1182,7 +1185,10 @@ free: +@@ -1180,7 +1183,10 @@ free: return; ieee80211_report_used_skb(local, skb, false); -- cgit v1.2.3