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/sta_info.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/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 4402ad5..a4a4f89 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -1453,7 +1453,7 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta, more_data = ieee80211_sta_ps_more_data(sta, ignored_acs, reason, driver_release_tids); - if (reason == IEEE80211_FRAME_RELEASE_PSPOLL) + if (driver_release_tids && reason == IEEE80211_FRAME_RELEASE_PSPOLL) driver_release_tids = BIT(find_highest_prio_tid(driver_release_tids)); |
