---

yaml --- r: 90556 b: refs/heads/master c: fff7710 h: refs/heads/master v: v3
git-mirror · Apr 8, 2008 · a29f917 · a29f917
1 parent 3b7c8a8
commit a29f917
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2aee82de5238625a7664f88d6ebff9de467bb685
+refs/heads/master: fff7710937f755099209357e5b5740d42a2c9f97
diff --git a/trunk/include/net/mac80211.h b/trunk/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/trunk/net/mac80211/tx.c b/trunk/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;