diff options
| author | Janusz.Dziedzic@tieto.com <Janusz.Dziedzic@tieto.com> | 2011-11-07 08:47:47 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-07 19:19:15 +0100 |
| commit | 24b9c373ab787ccacfa2c46736153708796f5cd6 (patch) | |
| tree | 4f9a128f15e42ac78e76b9ed596d7deaede97480 /net/mac80211/sta_info.c | |
| parent | net, wireless, mwifiex: Fix mem leak in mwifiex_update_curr_bss_params() (diff) | |
| download | linux-24b9c373ab787ccacfa2c46736153708796f5cd6.tar.xz linux-24b9c373ab787ccacfa2c46736153708796f5cd6.zip | |
mac80211: uAPSD - fix IEEE80211_FCTL_MOREDATA bit setting
Set IEEE80211_FCTL_MOREDATA bit also in case we have buffered
frames (more than one) only for one AC.
Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index ce962d2c8782..8eaa746ec7a2 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -1354,12 +1354,12 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta, * Use MoreData flag to indicate whether there are * more buffered frames for this STA */ - if (!more_data) - hdr->frame_control &= - cpu_to_le16(~IEEE80211_FCTL_MOREDATA); - else + if (more_data || !skb_queue_empty(&frames)) hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREDATA); + else + hdr->frame_control &= + cpu_to_le16(~IEEE80211_FCTL_MOREDATA); if (ieee80211_is_data_qos(hdr->frame_control) || ieee80211_is_qos_nullfunc(hdr->frame_control)) |