mac80211: Set IEEE80211_TXPD_REQ_TX_STATUS for all TX frames

All interfaces should set the IEEE80211_TXPD_REQ_TX_STATUS flag for all TX frames
which will force the master interface to set the IEEE80211_TX_CTL_REQ_TX_STATUS
flag. This in turn will allow drivers to check for that flag before reporting
the TX status to mac80211.

This is very usefull when frames (like beacons, RTS and CTS-to-self) should not
be reported back to mac80211. Later we could add more extensive checks to
exclude more frames from being reported, or let mac80211 decide if it wants
the frame for status reporting or not.

v2: Monitor interfaces should also set IEEE80211_TXPD_REQ_TX_STATUS

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 5f31a6233e132d4d424bf69c838fa5ddabc5f015..4c25fd5d76a7dbb70b5990eb1a6ecadf7e948174 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1337,6 +1337,8 @@ int ieee80211_monitor_start_xmit(struct sk_buff *skb,
        pkt_data->ifindex = dev->ifindex;
 
        pkt_data->flags |= IEEE80211_TXPD_DO_NOT_ENCRYPT;
+       /* Interfaces should always request a status report */
+       pkt_data->flags |= IEEE80211_TXPD_REQ_TX_STATUS;
 
        /*
         * fix up the pointers accounting for the radiotap
@@ -1618,6 +1620,9 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb,
        if (ethertype == ETH_P_PAE)
                pkt_data->flags |= IEEE80211_TXPD_EAPOL_FRAME;
 
+       /* Interfaces should always request a status report */
+       pkt_data->flags |= IEEE80211_TXPD_REQ_TX_STATUS;
+
        skb->dev = local->mdev;
        dev->stats.tx_packets++;
        dev->stats.tx_bytes += skb->len;