mac80211: fix tx queue allocation issues (#19329)
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Fri, 27 Mar 2015 20:31:14 +0000 (20:31 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Fri, 27 Mar 2015 20:31:14 +0000 (20:31 +0000)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45069 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/kernel/mac80211/patches/300-mac80211-add-an-intermediate-software-queue-implemen.patch

index d084f15..009c8d5 100644 (file)
@@ -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;
        }