From: Felix Fietkau Date: Fri, 27 Mar 2015 20:31:14 +0000 (+0000) Subject: mac80211: fix tx queue allocation issues (#19329) X-Git-Tag: reboot~3668 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=54dd25eef41986c18fae9453cc2bc713d195c390;p=oweals%2Fopenwrt.git mac80211: fix tx queue allocation issues (#19329) Signed-off-by: Felix Fietkau SVN-Revision: 45069 --- 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 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; }