Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git]
/
kernel
/
net
/
mac80211
/
main.c
diff --git
a/kernel/net/mac80211/main.c
b/kernel/net/mac80211/main.c
index
df3051d
..
e86daed
100644
(file)
--- a/
kernel/net/mac80211/main.c
+++ b/
kernel/net/mac80211/main.c
@@
-249,6
+249,7
@@
static void ieee80211_restart_work(struct work_struct *work)
{
struct ieee80211_local *local =
container_of(work, struct ieee80211_local, restart_work);
{
struct ieee80211_local *local =
container_of(work, struct ieee80211_local, restart_work);
+ struct ieee80211_sub_if_data *sdata;
/* wait for scan work complete */
flush_workqueue(local->workqueue);
/* wait for scan work complete */
flush_workqueue(local->workqueue);
@@
-257,6
+258,8
@@
static void ieee80211_restart_work(struct work_struct *work)
"%s called with hardware scan in progress\n", __func__);
rtnl_lock();
"%s called with hardware scan in progress\n", __func__);
rtnl_lock();
+ list_for_each_entry(sdata, &local->interfaces, list)
+ flush_delayed_work(&sdata->dec_tailroom_needed_wk);
ieee80211_scan_cancel(local);
ieee80211_reconfig(local);
rtnl_unlock();
ieee80211_scan_cancel(local);
ieee80211_reconfig(local);
rtnl_unlock();