diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-27 15:04:00 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-27 15:04:00 +0000 |
| commit | b67719f571635a29391b369f0df42c27428fb3ad (patch) | |
| tree | 242b2f926774878db492f8b0e767fed44e95dedd /package/kernel/mac80211 | |
| parent | 89abb27f2cfa253a422d405e40c04d7089d09a03 (diff) | |
| download | upstream-b67719f571635a29391b369f0df42c27428fb3ad.tar.gz upstream-b67719f571635a29391b369f0df42c27428fb3ad.tar.bz2 upstream-b67719f571635a29391b369f0df42c27428fb3ad.zip | |
mac80211: remove a leftover patch chunk that should have been deleted in r45061
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 45064
Diffstat (limited to 'package/kernel/mac80211')
| -rw-r--r-- | package/kernel/mac80211/patches/300-mac80211-add-an-intermediate-software-queue-implemen.patch | 24 |
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 |