hak5/wifipineapple-openwrt
1
0
Fork 0
mirror of https://github.com/hak5/wifipineapple-openwrt.git synced 2025-10-29 16:57:19 +00:00
Code Issues Packages Projects Releases 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45064 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
Felix Fietkau
2015-03-27 15:04:00 +00:00
parent 646588cf5c
commit 1fc997f891
1 changed files with 0 additions and 24 deletions
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