2020-02-11 12:48:14

by John Crispin

[permalink] [raw]
Subject: [PATCH 1/2] mac80211: allow setting queue_len for drivers not using wake_tx_queue

Currently a mac80211 driver can only set the txq_limit when using
wake_tx_queue. Not all drivers use wake_tx_queue. This patch adds a new
element to wiphy allowing a driver to set a custom tx_queue_len and the
code that will apply it in case it is set. The current default is
1000 which is too low for ath11k when doing HE rates.

Signed-off-by: John Crispin <[email protected]>
---
include/net/cfg80211.h | 2 ++
net/mac80211/iface.c | 4 ++++
2 files changed, 6 insertions(+)

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 0939645567e9..254080a04ee3 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -4742,6 +4742,8 @@ struct wiphy {
u32 txq_memory_limit;
u32 txq_quantum;

+ unsigned long tx_queue_len;
+
u8 support_mbssid:1,
support_only_he_mbssid:1;

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 3c00408e9c8c..128b3468d13e 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1834,6 +1834,10 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
if_setup, txqs, 1);
if (!ndev)
return -ENOMEM;
+
+ if (!local->ops->wake_tx_queue && local->hw.wiphy->tx_queue_len)
+ ndev->tx_queue_len = local->hw.wiphy->tx_queue_len;
+
dev_net_set(ndev, wiphy_net(local->hw.wiphy));

ndev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
--
2.20.1