mac80211: add station aid into ieee80211_tx_control

This patch is necessary for the upcoming Accesspoint patch for p54.

Signed-off-by: Christian Lamparter <chunkeey@web.de>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 2 insertions, 0 deletions

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 01b32152b89e..999f970da6ba 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -302,6 +302,7 @@ struct ieee80211_tx_control {
         u8 iv_len;              /* length of the IV field in octets */
         u8 queue;               /* hardware queue to use for this frame;
                                  * 0 = highest, hw->queues-1 = lowest */
+        u16 aid;                /* Station AID */
         int type;       /* internal */
 };
 
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 80f4343a3007..ea3fa0f91906 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -741,6 +741,7 @@ ieee80211_tx_h_misc(struct ieee80211_tx_data *tx)
         }
 
         if (tx->sta) {
+                control->aid = tx->sta->aid;
                 tx->sta->tx_packets++;
                 tx->sta->tx_fragments++;
                 tx->sta->tx_bytes += tx->skb->len;