diff options
| author | David S. Miller <davem@davemloft.net> | 2016-01-28 16:05:45 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-28 16:05:45 -0800 |
| commit | bd7c5e31552c06f1186606de8914a135e55f6bac (patch) | |
| tree | a3d29b319537297a3023af1949b15cca2cc38824 /net/mac80211/mlme.c | |
| parent | c731f0e3493cc9031a0aceea6a50c70beed23e6d (diff) | |
| parent | 6736fde9672ff6717ac576e9bba2fd5f3dfec822 (diff) | |
| download | op-kernel-dev-bd7c5e31552c06f1186606de8914a135e55f6bac.zip op-kernel-dev-bd7c5e31552c06f1186606de8914a135e55f6bac.tar.gz | |
Merge tag 'mac80211-for-davem-2016-01-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Here's a first set of fixes for the 4.5-rc cycle:
* make regulatory messages much less verbose by default
* various remain-on-channel fixes
* scheduled scanning fixes with hardware restart
* a PS-Poll handling fix; was broken just recently
* bugfix to avoid buffering non-bufferable MMPDUs
* world regulatory domain data fix
* a fix for scanning causing other work to get stuck
* hwsim: revert an older problematic patch that caused some
userspace tools to have issues - not that big a deal as
it's a debug only driver though
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 1c342e2..bfbb1ac 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -4005,8 +4005,6 @@ static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata) if (!ieee80211_hw_check(&sdata->local->hw, CONNECTION_MONITOR)) ieee80211_queue_work(&sdata->local->hw, &sdata->u.mgd.monitor_work); - /* and do all the other regular work too */ - ieee80211_queue_work(&sdata->local->hw, &sdata->work); } } |
