Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
net
/
mac80211
/
iface.c
diff --git
a/kernel/net/mac80211/iface.c
b/kernel/net/mac80211/iface.c
index
c9e325d
..
bcb0a1b
100644
(file)
--- a/
kernel/net/mac80211/iface.c
+++ b/
kernel/net/mac80211/iface.c
@@
-977,7
+977,10
@@
static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
if (sdata->vif.txq) {
struct txq_info *txqi = to_txq_info(sdata->vif.txq);
if (sdata->vif.txq) {
struct txq_info *txqi = to_txq_info(sdata->vif.txq);
+ spin_lock_bh(&txqi->queue.lock);
ieee80211_purge_tx_queue(&local->hw, &txqi->queue);
ieee80211_purge_tx_queue(&local->hw, &txqi->queue);
+ spin_unlock_bh(&txqi->queue.lock);
+
atomic_set(&sdata->txqs_len[txqi->txq.ac], 0);
}
atomic_set(&sdata->txqs_len[txqi->txq.ac], 0);
}
@@
-1747,7
+1750,7
@@
int ieee80211_if_add(struct ieee80211_local *local, const char *name,
ret = dev_alloc_name(ndev, ndev->name);
if (ret < 0) {
ret = dev_alloc_name(ndev, ndev->name);
if (ret < 0) {
-
free_netdev
(ndev);
+
ieee80211_if_free
(ndev);
return ret;
}
return ret;
}
@@
-1833,7
+1836,7
@@
int ieee80211_if_add(struct ieee80211_local *local, const char *name,
ret = register_netdevice(ndev);
if (ret) {
ret = register_netdevice(ndev);
if (ret) {
-
free_netdev
(ndev);
+
ieee80211_if_free
(ndev);
return ret;
}
}
return ret;
}
}