aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-11-28 14:23:09 +0100
committerFelix Fietkau <nbd@nbd.name>2017-11-28 14:23:43 +0100
commit47fa8654a1358aa63f5be0e51a3738f834de8d86 (patch)
treed2aea062cfb260fa2c1badcd24b51976d98693c4 /package
parent179125d3341182017359604ec950bd491da96611 (diff)
downloadupstream-47fa8654a1358aa63f5be0e51a3738f834de8d86.tar.gz
upstream-47fa8654a1358aa63f5be0e51a3738f834de8d86.tar.bz2
upstream-47fa8654a1358aa63f5be0e51a3738f834de8d86.zip
Revert "mac80211: tweak TSQ settings"
This reverts commit 2dc485250d516f1535eeaf53f0f2f5742e5f9e0c. This patch needs some additional checks in order to avoid overwriting unrelated fields for request sockets. Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package')
-rw-r--r--package/kernel/mac80211/patches/140-tweak-TSQ-setting.patch14
-rw-r--r--package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch2
2 files changed, 1 insertions, 15 deletions
diff --git a/package/kernel/mac80211/patches/140-tweak-TSQ-setting.patch b/package/kernel/mac80211/patches/140-tweak-TSQ-setting.patch
deleted file mode 100644
index cea4ca684b..0000000000
--- a/package/kernel/mac80211/patches/140-tweak-TSQ-setting.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/net/mac80211/tx.c
-+++ b/net/mac80211/tx.c
-@@ -3750,6 +3750,11 @@ 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 && 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/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch b/package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
index dba01176fc..934e2e122c 100644
--- a/package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
+++ b/package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
@@ -56,7 +56,7 @@ Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
if (txq->sta)
tx.sta = container_of(txq->sta, struct sta_info, sta);
-@@ -3795,6 +3796,7 @@ ieee80211_build_data_template(struct iee
+@@ -3790,6 +3791,7 @@ ieee80211_build_data_template(struct iee
hdr = (void *)skb->data;
tx.sta = sta_info_get(sdata, hdr->addr1);
tx.skb = skb;