From: Pontus Fuchs <pontus.fuchs@gmail.com>
Date: Tue, 4 Jun 2013 10:44:52 +0000 (+0200)
Subject: mac80211: set IEEE80211_TX_CTL_REQ_TX_STATUS on nullframes
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ff40b425f04144771920b79672d6691910c7def7;p=linux-beck.git

mac80211: set 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 <pontus.fuchs@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index f44f4caa69ee..9950e13f641b 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;