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
/
drivers
/
net
/
wireless
/
iwlwifi
/
mvm
/
mac80211.c
diff --git
a/kernel/drivers/net/wireless/iwlwifi/mvm/mac80211.c
b/kernel/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index
dda9f7b
..
60c138a
100644
(file)
--- a/
kernel/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/
kernel/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@
-1404,7
+1404,7
@@
void __iwl_mvm_mac_stop(struct iwl_mvm *mvm)
* The work item could be running or queued if the
* ROC time event stops just as we get here.
*/
-
cancel_work_sync
(&mvm->roc_done_wk);
+
flush_work
(&mvm->roc_done_wk);
iwl_trans_stop_device(mvm->trans);