aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-27 20:31:14 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-27 20:31:14 +0000
commitaf171bd1d97ff704fe6ff5a47b549f12d44d07d3 (patch)
tree86c0949206db589c95cb919ef429750d7adfecf3 /package/kernel/mac80211
parent1c61d7a279c25a5bfac68f8a48412b683807699b (diff)
downloadupstream-af171bd1d97ff704fe6ff5a47b549f12d44d07d3.tar.gz
upstream-af171bd1d97ff704fe6ff5a47b549f12d44d07d3.tar.bz2
upstream-af171bd1d97ff704fe6ff5a47b549f12d44d07d3.zip
mac80211: fix tx queue allocation issues (#19329)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45069 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211')
-rw-r--r--package/kernel/mac80211/patches/300-mac80211-add-an-intermediate-software-queue-implemen.patch8
1 files changed, 5 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/300-mac80211-add-an-intermediate-software-queue-implemen.patch b/package/kernel/mac80211/patches/300-mac80211-add-an-intermediate-software-queue-implemen.patch
index d084f15012..009c8d58c8 100644
--- a/package/kernel/mac80211/patches/300-mac80211-add-an-intermediate-software-queue-implemen.patch
+++ b/package/kernel/mac80211/patches/300-mac80211-add-an-intermediate-software-queue-implemen.patch
@@ -287,12 +287,14 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
name, NET_NAME_UNKNOWN,
ieee80211_if_setup, txqs, 1);
if (!ndev)
-@@ -1731,6 +1747,9 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1731,6 +1747,11 @@ int ieee80211_if_add(struct ieee80211_lo
memcpy(sdata->vif.addr, ndev->dev_addr, ETH_ALEN);
memcpy(sdata->name, ndev->name, IFNAMSIZ);
-+ txqi = netdev_priv(ndev) + size;
-+ ieee80211_init_tx_queue(sdata, NULL, txqi, 0);
++ if (txq_size) {
++ txqi = netdev_priv(ndev) + size;
++ ieee80211_init_tx_queue(sdata, NULL, txqi, 0);
++ }
+
sdata->dev = ndev;
}