diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-08-04 15:21:46 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-08-04 15:21:46 -0700 |
commit | 977826e7012c4efebcb5b923d15455ebd468b579 (patch) | |
tree | 14481a5a06a6b574d161706d8c7df85fce701384 /net/mac80211 | |
parent | faefdddc4f71cd099a82ac24055a51438b1ee66a (diff) | |
parent | eb57744377e833c82168b0e8487593d038a67551 (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
* linux-linaro-lsk-v3.14: (126 commits)
Linux 3.14.49
MIPS: KVM: Do not sign extend on unsigned MMIO load
qla2xxx: Mark port lost when we receive an RSCN for it.
Fix firmware loader uevent buffer NULL pointer dereference
hpfs: hpfs_error: Remove static buffer, use vsprintf extension %pV instead
arm64: Don't report clear pmds and puds as huge
agp/intel: Fix typo in needs_ilk_vtd_wa()
rbd: use GFP_NOIO in rbd_obj_request_create()
9p: don't leave a half-initialized inode sitting around
9p: forgetting to cancel request on interrupted zero-copy RPC
SUNRPC: Fix a memory leak in the backchannel code
nfs: increase size of EXCHANGE_ID name string buffer
fixing infinite OPEN loop in 4.0 stateid recovery
NFS: Fix size of NFSACL SETACL operations
watchdog: omap: assert the counter being stopped before reprogramming
of: return NUMA_NO_NODE from fallback of_node_to_nid()
block: Do a full clone when splitting discard bios
USB: usbfs: allow URBs to be reaped after disconnection
dell-laptop: Fix allocating & freeing SMI buffer page
ideapad: fix software rfkill setting
...
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index c7a7a86afdb8..9e58c99e3bdc 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -248,6 +248,7 @@ static void ieee80211_restart_work(struct work_struct *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); @@ -256,6 +257,8 @@ static void ieee80211_restart_work(struct work_struct *work) "%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(); |