mac80211: remove antenna_sel_tx TX info field

This field is never set to anything non-zero in
mac80211, so we should be able to remove it.
Unfortunately though, the iwlwifi and iwlegacy
drivers use it for their internal TX status
processing (which shouldn't be using the rate
control API to start with), so add a new field
"status.antenna" for them, at least for now.

In the future, I plan to use the new field to
hold the hardware queue, while the SKB's queue
mapping holds the AC.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index dc0d3e71575..a0e79d13fa8 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -522,7 +522,7 @@ struct ieee80211_tx_rate {
  *
  * @flags: transmit info flags, defined above
  * @band: the band to transmit on (use for checking for races)
- * @antenna_sel_tx: antenna to use, 0 for automatic diversity
+ * @reserved: reserved for future use
  * @ack_frame_id: internal frame ID for TX status, used internally
  * @control: union for control data
  * @status: union for status data
@@ -538,7 +538,7 @@ struct ieee80211_tx_info {
         u32 flags;
         u8 band;
 
-        u8 antenna_sel_tx;
+        u8 reserved;
 
         u16 ack_frame_id;
 
@@ -564,7 +564,8 @@ struct ieee80211_tx_info {
                         u8 ampdu_ack_len;
                         int ack_signal;
                         u8 ampdu_len;
-                        /* 15 bytes free */
+                        u8 antenna;
+                        /* 14 bytes free */
                 } status;
                 struct {
                         struct ieee80211_tx_rate driver_rates[