From c655b9074bcffbb6a785034829e99cfc5b49bc46 Mon Sep 17 00:00:00 2001 From: "Janusz.Dziedzic@tieto.com" Date: Mon, 7 Nov 2011 09:47:47 +0200 Subject: [PATCH] --- yaml --- r: 275676 b: refs/heads/master c: 24b9c373ab787ccacfa2c46736153708796f5cd6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/sta_info.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 31dbceef797b..5ec89fc5ebbd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db652e4b36e5f1e5f49a4a49caf3aa365fe851c4 +refs/heads/master: 24b9c373ab787ccacfa2c46736153708796f5cd6 diff --git a/trunk/net/mac80211/sta_info.c b/trunk/net/mac80211/sta_info.c index ce962d2c8782..8eaa746ec7a2 100644 --- a/trunk/net/mac80211/sta_info.c +++ b/trunk/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))