aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-27 15:04:00 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-27 15:04:00 +0000
commit1fc997f891f7a0f2335950096724a8334559a36c (patch)
treebf1b094dee503ed11daeb8e7634d4ab458d2e34a
parent646588cf5c294286dc0d47be3ec426a7681c0d4d (diff)
downloadupstream-1fc997f891f7a0f2335950096724a8334559a36c.tar.gz
upstream-1fc997f891f7a0f2335950096724a8334559a36c.tar.bz2
upstream-1fc997f891f7a0f2335950096724a8334559a36c.zip
mac80211: remove a leftover patch chunk that should have been deleted in r45061
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45064 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/mac80211/patches/300-mac80211-add-an-intermediate-software-queue-implemen.patch24
1 files changed, 0 insertions, 24 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 ee62c2f5ba..d084f15012 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
@@ -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