diff options
| author | Johannes Berg | 2008-02-20 11:21:35 +0100 |
|---|---|---|
| committer | John W. Linville | 2008-02-29 21:37:26 +0100 |
| commit | 004c872e78d433f84f0a5cd4db7a6c780c0946e1 (patch) | |
| tree | bd9e7cd0b69e720738d49e170e4f4f64e9111e1a /net/mac80211/tx.c | |
| parent | mac80211: remove sta TIM flag, fix expiry TIM handling (diff) | |
| download | kernel-qcow2-linux-004c872e78d433f84f0a5cd4db7a6c780c0946e1.tar.gz kernel-qcow2-linux-004c872e78d433f84f0a5cd4db7a6c780c0946e1.tar.xz kernel-qcow2-linux-004c872e78d433f84f0a5cd4db7a6c780c0946e1.zip | |
mac80211: consolidate TIM handling code
This consolidates all TIM handling code to avoid re-introducing
errors with the bitmap/set_tim order and to reduce code. While
reading the code I noticed a possible problem so I also added
a comment about that.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index db6a871b51ed..69fdb763aa8b 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -416,14 +416,11 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_txrx_data *tx) dev_kfree_skb(old); } else tx->local->total_ps_buffered++; + /* Queue frame to be sent after STA sends an PS Poll frame */ - if (skb_queue_empty(&sta->ps_tx_buf)) { - if (tx->sdata->bss) - bss_tim_set(tx->local, tx->sdata->bss, sta->aid); - if (tx->local->ops->set_tim) - tx->local->ops->set_tim(local_to_hw(tx->local), - sta->aid, 1); - } + if (skb_queue_empty(&sta->ps_tx_buf)) + sta_info_set_tim_bit(sta); + pkt_data = (struct ieee80211_tx_packet_data *)tx->skb->cb; pkt_data->jiffies = jiffies; skb_queue_tail(&sta->ps_tx_buf, tx->skb); |