2013-06-04 10:45:27

by Pontus Fuchs

[permalink] [raw]
Subject: [PATCH] mac80211: Use IEEE80211_TX_CTL_REQ_TX_STATUS on nullframes

The connection monitor needs to know the tx status of
nullframes to work properly.

Signed-off-by: Pontus Fuchs <[email protected]>
---
net/mac80211/mlme.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 118540b..005fea5 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -880,6 +880,10 @@ void ieee80211_send_nullfunc(struct ieee80211_local *local,

IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT |
IEEE80211_TX_INTFL_OFFCHAN_TX_OK;
+
+ if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)
+ IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_CTL_REQ_TX_STATUS;
+
if (ifmgd->flags & (IEEE80211_STA_BEACON_POLL |
IEEE80211_STA_CONNECTION_POLL))
IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_CTL_USE_MINRATE;
--
1.8.1.2



2013-06-04 10:53:07

by Johannes Berg

[permalink] [raw]
Subject: Re: [PATCH] mac80211: Use IEEE80211_TX_CTL_REQ_TX_STATUS on nullframes

On Tue, 2013-06-04 at 12:44 +0200, Pontus Fuchs wrote:
> The connection monitor needs to know the tx status of
> nullframes to work properly.

Applied.

johannes