summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorPontus Fuchs <pontus.fuchs@gmail.com>2013-06-04 12:44:52 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-06-04 12:52:39 +0200
commitff40b425f04144771920b79672d6691910c7def7 (patch)
tree96fc542f6f0691c9c16d1ca23beedd94fc858ad5 /net/mac80211/mlme.c
parent9c90a9f64c21b0a3983655c9c08cf98489057a43 (diff)
downloadblackbird-op-linux-ff40b425f04144771920b79672d6691910c7def7.tar.gz
blackbird-op-linux-ff40b425f04144771920b79672d6691910c7def7.zip
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>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c4
1 files changed, 4 insertions, 0 deletions
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;
OpenPOWER on IntegriCloud