Commit d748b464 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8f727ef3

drivers/net/wireless/b43/xmit.c

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ int b43_generate_txhdr(struct b43_wldev *dev, 
	if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)

		phy_ctl |= B43_TXH_PHY_SHORTPRMBL;



	switch (b43_ieee80211_antenna_sanitize(dev, info->antenna_sel_tx)) {

	switch (b43_ieee80211_antenna_sanitize(dev, 0)) {

	case 0: /* Default */

		phy_ctl |= B43_TXH_PHY_ANT01AUTO;

		break;

drivers/net/wireless/b43legacy/xmit.c

+1 −13
Original line number Diff line number Diff line
@@ -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);

	}



	/* MAC control */

	rates = info->control.rates;

drivers/net/wireless/iwlegacy/4965-mac.c

+2 −2
Original line number Diff line number Diff line
@@ -2850,9 +2850,9 @@ void 
il4965_hwrate_to_tx_control(struct il_priv *il, u32 rate_n_flags,

			    struct ieee80211_tx_info *info)

{

	struct ieee80211_tx_rate *r = &info->control.rates[0];

	struct ieee80211_tx_rate *r = &info->status.rates[0];



	info->antenna_sel_tx =

	info->status.antenna =

	    ((rate_n_flags & RATE_MCS_ANT_ABC_MSK) >> RATE_MCS_ANT_POS);

	if (rate_n_flags & RATE_MCS_HT_MSK)

		r->flags |= IEEE80211_TX_RC_MCS;

drivers/net/wireless/iwlegacy/4965-rs.c

+1 −1
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ il4965_rs_tx_status(void *il_r, struct ieee80211_supported_band *sband, 
	    tbl_type.is_SGI != !!(mac_flags & IEEE80211_TX_RC_SHORT_GI) ||

	    tbl_type.is_ht40 != !!(mac_flags & IEEE80211_TX_RC_40_MHZ_WIDTH) ||

	    tbl_type.is_dup != !!(mac_flags & IEEE80211_TX_RC_DUP_DATA) ||

	    tbl_type.ant_type != info->antenna_sel_tx ||

	    tbl_type.ant_type != info->status.antenna ||

	    !!(tx_rate & RATE_MCS_HT_MSK) != !!(mac_flags & IEEE80211_TX_RC_MCS)

	    || !!(tx_rate & RATE_MCS_GF_MSK) !=

	    !!(mac_flags & IEEE80211_TX_RC_GREEN_FIELD) || rs_idx != mac_idx) {

drivers/net/wireless/iwlwifi/iwl-agn-rs.c

+1 −1
Original line number Diff line number Diff line
@@ -969,7 +969,7 @@ static void rs_tx_status(void *priv_r, struct ieee80211_supported_band *sband, 
	    (tbl_type.is_SGI != !!(mac_flags & IEEE80211_TX_RC_SHORT_GI)) ||

	    (tbl_type.is_ht40 != !!(mac_flags & IEEE80211_TX_RC_40_MHZ_WIDTH)) ||

	    (tbl_type.is_dup != !!(mac_flags & IEEE80211_TX_RC_DUP_DATA)) ||

	    (tbl_type.ant_type != info->antenna_sel_tx) ||

	    (tbl_type.ant_type != info->status.antenna) ||

	    (!!(tx_rate & RATE_MCS_HT_MSK) != !!(mac_flags & IEEE80211_TX_RC_MCS)) ||

	    (!!(tx_rate & RATE_MCS_GF_MSK) != !!(mac_flags & IEEE80211_TX_RC_GREEN_FIELD)) ||

	    (rs_index != mac_index)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE