diff options
author | Johannes Berg <johannes.berg@intel.com> | 2011-09-29 10:04:34 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-09-30 15:57:16 -0400 |
commit | ce662b44ce22e3e8886104d5feb2a451d7ba560f (patch) | |
tree | eb584058dec73807f192fc19725adfece5bad539 /net/mac80211/tx.c | |
parent | 47086fc51aa2220f58049704a8b73e4fcdf372b9 (diff) |
mac80211: send (QoS) Null if no buffered frames
For PS-poll, there's a possible race between
us expiring a frame and the station polling
for it -- send it a null frame in that case.
For uAPSD, the standard says that we have to
send a frame in each SP, so send null if we
don't have any other frames.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index a0676d39fe8f..5bf91c43c88c 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -1520,8 +1520,7 @@ static int ieee80211_skb_resize(struct ieee80211_sub_if_data *sdata, | |||
1520 | return 0; | 1520 | return 0; |
1521 | } | 1521 | } |
1522 | 1522 | ||
1523 | static void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, | 1523 | void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb) |
1524 | struct sk_buff *skb) | ||
1525 | { | 1524 | { |
1526 | struct ieee80211_local *local = sdata->local; | 1525 | struct ieee80211_local *local = sdata->local; |
1527 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | 1526 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |