KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mac80211: remove a leftover patch chunk that should have been deleted in r45061

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 45064
This commit is contained in:
Felix Fietkau 2015-03-27 15:04:00 +00:00
parent 89abb27f2c
commit b67719f571
1 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -297,30 +297,6 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
sdata->dev = ndev;
}
@@ -1773,6 +1792,15 @@ int ieee80211_if_add(struct ieee80211_lo
ieee80211_setup_sdata(sdata, type);
if (ndev) {
+ struct txq_info *txqi = NULL;
+
+ if (local->ops->wake_tx_queue) {
+ txqi = kzalloc(sizeof(*txqi) +
+ local->hw.txq_data_size, GFP_KERNEL);
+ if (txqi)
+ ieee80211_init_tx_queue(sdata, NULL, txqi, 0);
+ }
+
if (params) {
ndev->ieee80211_ptr->use_4addr = params->use_4addr;
if (type == NL80211_IFTYPE_STATION)
@@ -1785,6 +1813,7 @@ int ieee80211_if_add(struct ieee80211_lo
ret = register_netdevice(ndev);
if (ret) {
+ kfree(txqi);
free_netdev(ndev);
return ret;
}
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -1019,6 +1019,9 @@ int ieee80211_register_hw(struct ieee802