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>
This commit is contained in:

committed by
John W. Linville

父節點
8f727ef3c4
當前提交
d748b4642a
@@ -277,19 +277,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
|
||||
phy_ctl |= B43legacy_TX4_PHY_ENC_OFDM;
|
||||
if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)
|
||||
phy_ctl |= B43legacy_TX4_PHY_SHORTPRMBL;
|
||||
switch (info->antenna_sel_tx) {
|
||||
case 0:
|
||||
phy_ctl |= B43legacy_TX4_PHY_ANTLAST;
|
||||
break;
|
||||
case 1:
|
||||
phy_ctl |= B43legacy_TX4_PHY_ANT0;
|
||||
break;
|
||||
case 2:
|
||||
phy_ctl |= B43legacy_TX4_PHY_ANT1;
|
||||
break;
|
||||
default:
|
||||
B43legacy_BUG_ON(1);
|
||||
}
|
||||
phy_ctl |= B43legacy_TX4_PHY_ANTLAST;
|
||||
|
||||
/* MAC control */
|
||||
rates = info->control.rates;
|
||||
|
Reference in New Issue
Block a user