diff options
| author | Marco Porsch | 2012-03-16 15:30:26 +0100 |
|---|---|---|
| committer | John W. Linville | 2012-04-09 22:06:00 +0200 |
| commit | 52a3f20c09559465f821b54838decb397054e7de (patch) | |
| tree | 92a0bf0179ea2be596d4feb976e2ebccf4627862 /net/mac80211/sta_info.c | |
| parent | mwifiex: add set_cqm_rssi_config handler support (diff) | |
| download | kernel-qcow2-linux-52a3f20c09559465f821b54838decb397054e7de.tar.gz kernel-qcow2-linux-52a3f20c09559465f821b54838decb397054e7de.tar.xz kernel-qcow2-linux-52a3f20c09559465f821b54838decb397054e7de.zip | |
mac80211: end service period only after sending last buffered frame
Signed-off-by: Marco Porsch <marco.porsch@etit.tu-chemnitz.de>
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 | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 38137cb5f6f0..7fd7ac48f893 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -1195,13 +1195,15 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta, ieee80211_is_qos_nullfunc(hdr->frame_control)) qoshdr = ieee80211_get_qos_ctl(hdr); - /* set EOSP for the frame */ - if (reason == IEEE80211_FRAME_RELEASE_UAPSD && - qoshdr && skb_queue_empty(&frames)) - *qoshdr |= IEEE80211_QOS_CTL_EOSP; - - info->flags |= IEEE80211_TX_STATUS_EOSP | - IEEE80211_TX_CTL_REQ_TX_STATUS; + /* end service period after last frame */ + if (skb_queue_empty(&frames)) { + if (reason == IEEE80211_FRAME_RELEASE_UAPSD && + qoshdr) + *qoshdr |= IEEE80211_QOS_CTL_EOSP; + + info->flags |= IEEE80211_TX_STATUS_EOSP | + IEEE80211_TX_CTL_REQ_TX_STATUS; + } if (qoshdr) tids |= BIT(*qoshdr & IEEE80211_QOS_CTL_TID_MASK); |