mac80211: add station aid into ieee80211_tx_control

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

Signed-off-by: Christian Lamparter <[email protected]>
Acked-by: Johannes Berg <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 01b32152b89e53074fae44e9494cbf9aef9d58a7..999f970da6ba6983a41b599419c30ef89ce9a16f 100644 (file)
--- 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 80f4343a3007e6351294962805974e64c3acf8df..ea3fa0f919066c176a3e34cb6bcb02ced5792ec6 100644 (file)
--- 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;