From 91fb3ce56ba1a79a8368012cdcd161e861778b9a Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 29 Aug 2020 07:50:07 +0200 Subject: [PATCH] mac80211: remove an obsolete patch that is no longer doing anything useful Signed-off-by: Felix Fietkau --- .../patches/subsys/140-tweak-TSQ-setting.patch | 15 --------------- ...reduce-packet-loss-event-false-positives.patch | 10 +++++----- ...0211-rework-tx-encapsulation-offload-API.patch | 2 +- ...p-NEED_TXPROCESSING-and-HW_80211_ENCAP-t.patch | 6 +++--- ...-missing-queue-hash-initialization-to-80.patch | 2 +- ...ck-and-refresh-aggregation-session-in-en.patch | 4 ++-- ...p-encap-offload-for-tx-multicast-control.patch | 6 +++--- ...-info-control.hw_key-for-encap-offload-p.patch | 4 ++-- 8 files changed, 17 insertions(+), 32 deletions(-) delete mode 100644 package/kernel/mac80211/patches/subsys/140-tweak-TSQ-setting.patch diff --git a/package/kernel/mac80211/patches/subsys/140-tweak-TSQ-setting.patch b/package/kernel/mac80211/patches/subsys/140-tweak-TSQ-setting.patch deleted file mode 100644 index 2bb51f3693..0000000000 --- a/package/kernel/mac80211/patches/subsys/140-tweak-TSQ-setting.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/net/mac80211/tx.c -+++ b/net/mac80211/tx.c -@@ -4136,6 +4136,12 @@ out: - netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, - struct net_device *dev) - { -+#if defined(sk_pacing_shift) || LINUX_VERSION_IS_GEQ(4,15,0) -+ if (skb->sk && sk_fullsock(skb->sk) && -+ skb->sk->sk_pacing_shift != 6) -+ skb->sk->sk_pacing_shift = 6; -+#endif -+ - if (unlikely(ieee80211_multicast_to_unicast(skb, dev))) { - struct sk_buff_head queue; - diff --git a/package/kernel/mac80211/patches/subsys/310-mac80211-reduce-packet-loss-event-false-positives.patch b/package/kernel/mac80211/patches/subsys/310-mac80211-reduce-packet-loss-event-false-positives.patch index 85094389a8..62f2419dd3 100644 --- a/package/kernel/mac80211/patches/subsys/310-mac80211-reduce-packet-loss-event-false-positives.patch +++ b/package/kernel/mac80211/patches/subsys/310-mac80211-reduce-packet-loss-event-false-positives.patch @@ -35,7 +35,7 @@ Signed-off-by: Felix Fietkau unsigned long last_ack; --- a/net/mac80211/status.c +++ b/net/mac80211/status.c -@@ -749,12 +749,16 @@ static void ieee80211_report_used_skb(st +@@ -757,12 +757,16 @@ static void ieee80211_report_used_skb(st * - current throughput (higher value for higher tpt)? */ #define STA_LOST_PKT_THRESHOLD 50 @@ -52,7 +52,7 @@ Signed-off-by: Felix Fietkau /* If driver relies on its own algorithm for station kickout, skip * mac80211 packet loss mechanism. */ -@@ -767,21 +771,20 @@ static void ieee80211_lost_packet(struct +@@ -775,21 +779,20 @@ static void ieee80211_lost_packet(struct return; sta->status_stats.lost_packets++; @@ -81,7 +81,7 @@ Signed-off-by: Felix Fietkau return; cfg80211_cqm_pktloss_notify(sta->sdata->dev, sta->sta.addr, -@@ -1034,9 +1037,7 @@ static void __ieee80211_tx_status(struct +@@ -1042,9 +1045,7 @@ static void __ieee80211_tx_status(struct sta->status_stats.lost_packets = 0; /* Track when last TDLS packet was ACKed */ @@ -92,7 +92,7 @@ Signed-off-by: Felix Fietkau } else if (noack_success) { /* nothing to do here, do not account as lost */ } else { -@@ -1169,9 +1170,8 @@ void ieee80211_tx_status_ext(struct ieee +@@ -1177,9 +1178,8 @@ void ieee80211_tx_status_ext(struct ieee if (sta->status_stats.lost_packets) sta->status_stats.lost_packets = 0; @@ -104,7 +104,7 @@ Signed-off-by: Felix Fietkau } else if (test_sta_flag(sta, WLAN_STA_PS_STA)) { return; } else if (noack_success) { -@@ -1260,8 +1260,7 @@ void ieee80211_tx_status_8023(struct iee +@@ -1268,8 +1268,7 @@ void ieee80211_tx_status_8023(struct iee if (sta->status_stats.lost_packets) sta->status_stats.lost_packets = 0; diff --git a/package/kernel/mac80211/patches/subsys/314-mac80211-rework-tx-encapsulation-offload-API.patch b/package/kernel/mac80211/patches/subsys/314-mac80211-rework-tx-encapsulation-offload-API.patch index 22697718f8..4f0d264947 100644 --- a/package/kernel/mac80211/patches/subsys/314-mac80211-rework-tx-encapsulation-offload-API.patch +++ b/package/kernel/mac80211/patches/subsys/314-mac80211-rework-tx-encapsulation-offload-API.patch @@ -637,7 +637,7 @@ Signed-off-by: Felix Fietkau #undef TRACE_INCLUDE_PATH --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4270,11 +4270,6 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4264,11 +4264,6 @@ netdev_tx_t ieee80211_subif_start_xmit_8 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct sta_info *sta; diff --git a/package/kernel/mac80211/patches/subsys/318-mac80211-swap-NEED_TXPROCESSING-and-HW_80211_ENCAP-t.patch b/package/kernel/mac80211/patches/subsys/318-mac80211-swap-NEED_TXPROCESSING-and-HW_80211_ENCAP-t.patch index a0ce6a2b15..85287a6ef1 100644 --- a/package/kernel/mac80211/patches/subsys/318-mac80211-swap-NEED_TXPROCESSING-and-HW_80211_ENCAP-t.patch +++ b/package/kernel/mac80211/patches/subsys/318-mac80211-swap-NEED_TXPROCESSING-and-HW_80211_ENCAP-t.patch @@ -198,7 +198,7 @@ Signed-off-by: Felix Fietkau goto encap_out; if (info->control.flags & IEEE80211_TX_CTRL_FAST_XMIT) { -@@ -4253,7 +4253,7 @@ static void ieee80211_8023_xmit(struct i +@@ -4247,7 +4247,7 @@ static void ieee80211_8023_xmit(struct i sdata = container_of(sdata->bss, struct ieee80211_sub_if_data, u.ap); @@ -207,7 +207,7 @@ Signed-off-by: Felix Fietkau info->control.vif = &sdata->vif; ieee80211_tx_8023(sdata, skb, skb->len, sta, false); -@@ -4357,7 +4357,7 @@ static bool ieee80211_tx_pending_skb(str +@@ -4351,7 +4351,7 @@ static bool ieee80211_tx_pending_skb(str sdata = vif_to_sdata(info->control.vif); @@ -216,7 +216,7 @@ Signed-off-by: Felix Fietkau chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf); if (unlikely(!chanctx_conf)) { dev_kfree_skb(skb); -@@ -4365,7 +4365,7 @@ static bool ieee80211_tx_pending_skb(str +@@ -4359,7 +4359,7 @@ static bool ieee80211_tx_pending_skb(str } info->band = chanctx_conf->def.chan->band; result = ieee80211_tx(sdata, NULL, skb, true, 0); diff --git a/package/kernel/mac80211/patches/subsys/320-mac80211-add-missing-queue-hash-initialization-to-80.patch b/package/kernel/mac80211/patches/subsys/320-mac80211-add-missing-queue-hash-initialization-to-80.patch index 1ec22dbbc8..d9d3fded75 100644 --- a/package/kernel/mac80211/patches/subsys/320-mac80211-add-missing-queue-hash-initialization-to-80.patch +++ b/package/kernel/mac80211/patches/subsys/320-mac80211-add-missing-queue-hash-initialization-to-80.patch @@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4206,6 +4206,12 @@ static void ieee80211_8023_xmit(struct i +@@ -4200,6 +4200,12 @@ static void ieee80211_8023_xmit(struct i if (is_zero_ether_addr(ra)) goto out_free; diff --git a/package/kernel/mac80211/patches/subsys/321-mac80211-check-and-refresh-aggregation-session-in-en.patch b/package/kernel/mac80211/patches/subsys/321-mac80211-check-and-refresh-aggregation-session-in-en.patch index 5c149e7d95..0188e19b71 100644 --- a/package/kernel/mac80211/patches/subsys/321-mac80211-check-and-refresh-aggregation-session-in-en.patch +++ b/package/kernel/mac80211/patches/subsys/321-mac80211-check-and-refresh-aggregation-session-in-en.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4195,6 +4195,8 @@ static void ieee80211_8023_xmit(struct i +@@ -4189,6 +4189,8 @@ static void ieee80211_8023_xmit(struct i bool authorized = false; bool multicast; unsigned char *ra = ehdr->h_dest; @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau if (IS_ERR(sta) || (sta && !sta->uploaded)) sta = NULL; -@@ -4232,6 +4234,22 @@ static void ieee80211_8023_xmit(struct i +@@ -4226,6 +4228,22 @@ static void ieee80211_8023_xmit(struct i memset(info, 0, sizeof(*info)); diff --git a/package/kernel/mac80211/patches/subsys/325-mac80211-skip-encap-offload-for-tx-multicast-control.patch b/package/kernel/mac80211/patches/subsys/325-mac80211-skip-encap-offload-for-tx-multicast-control.patch index 6ea9c3c913..a32075768a 100644 --- a/package/kernel/mac80211/patches/subsys/325-mac80211-skip-encap-offload-for-tx-multicast-control.patch +++ b/package/kernel/mac80211/patches/subsys/325-mac80211-skip-encap-offload-for-tx-multicast-control.patch @@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau enabled = false; --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4190,88 +4190,47 @@ static void ieee80211_8023_xmit(struct i +@@ -4184,88 +4184,47 @@ static void ieee80211_8023_xmit(struct i struct sk_buff *skb) { struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); @@ -137,7 +137,7 @@ Signed-off-by: Felix Fietkau if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) sdata = container_of(sdata->bss, -@@ -4292,6 +4251,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4286,6 +4245,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 struct net_device *dev) { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); @@ -145,7 +145,7 @@ Signed-off-by: Felix Fietkau struct sta_info *sta; if (unlikely(skb->len < ETH_HLEN)) { -@@ -4303,6 +4263,10 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4297,6 +4257,10 @@ netdev_tx_t ieee80211_subif_start_xmit_8 if (ieee80211_lookup_ra_sta(sdata, skb, &sta)) kfree_skb(skb); diff --git a/package/kernel/mac80211/patches/subsys/326-mac80211-set-info-control.hw_key-for-encap-offload-p.patch b/package/kernel/mac80211/patches/subsys/326-mac80211-set-info-control.hw_key-for-encap-offload-p.patch index 2b7579b24e..421d18f2c2 100644 --- a/package/kernel/mac80211/patches/subsys/326-mac80211-set-info-control.hw_key-for-encap-offload-p.patch +++ b/package/kernel/mac80211/patches/subsys/326-mac80211-set-info-control.hw_key-for-encap-offload-p.patch @@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4191,6 +4191,7 @@ static void ieee80211_8023_xmit(struct i +@@ -4185,6 +4185,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 struct tid_ampdu_tx *tid_tx; u8 tid; -@@ -4239,6 +4240,10 @@ static void ieee80211_8023_xmit(struct i +@@ -4233,6 +4234,10 @@ static void ieee80211_8023_xmit(struct i info->flags |= IEEE80211_TX_CTL_HW_80211_ENCAP; info->control.vif = &sdata->vif; -- 2.30.2