Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab276103 authored by Oleksij Rempel's avatar Oleksij Rempel Committed by John W. Linville
Browse files

ath9k: remove useless flag conversation. 



some flags used only outside of ath9k - In this case we can use
"enum mac80211_rx_flags" and pass it upstream without extra
conversation.

Signed-off-by: default avatarOleksij Rempel <linux@rempel-privat.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a910e4a9

drivers/net/wireless/ath/ath9k/ar9003_mac.c

+3 −2
Original line number Diff line number Diff line
@@ -469,6 +469,7 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs, 


	rxs->rs_status = 0;

	rxs->rs_flags =  0;

	rxs->flag =  0;



	rxs->rs_datalen = rxsp->status2 & AR_DataLen;

	rxs->rs_tstamp =  rxsp->status3;
@@ -493,8 +494,8 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs, 
	rxs->rs_isaggr = (rxsp->status11 & AR_RxAggr) ? 1 : 0;

	rxs->rs_moreaggr = (rxsp->status11 & AR_RxMoreAggr) ? 1 : 0;

	rxs->rs_antenna = (MS(rxsp->status4, AR_RxAntenna) & 0x7);

	rxs->rs_flags  = (rxsp->status4 & AR_GI) ? ATH9K_RX_GI : 0;

	rxs->rs_flags  |= (rxsp->status4 & AR_2040) ? ATH9K_RX_2040 : 0;

	rxs->flag  |= (rxsp->status4 & AR_GI) ? RX_FLAG_SHORT_GI : 0;

	rxs->flag  |= (rxsp->status4 & AR_2040) ? RX_FLAG_40MHZ : 0;



	rxs->evm0 = rxsp->status6;

	rxs->evm1 = rxsp->status7;

drivers/net/wireless/ath/ath9k/mac.c

+7 −4
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds, 


	rs->rs_status = 0;

	rs->rs_flags = 0;

	rs->flag = 0;



	rs->rs_datalen = ads.ds_rxstatus1 & AR_DataLen;

	rs->rs_tstamp = ads.AR_RcvTimestamp;
@@ -586,10 +587,12 @@ int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds, 
	rs->rs_moreaggr =

		(ads.ds_rxstatus8 & AR_RxMoreAggr) ? 1 : 0;

	rs->rs_antenna = MS(ads.ds_rxstatus3, AR_RxAntenna);

	rs->rs_flags =

		(ads.ds_rxstatus3 & AR_GI) ? ATH9K_RX_GI : 0;

	rs->rs_flags |=

		(ads.ds_rxstatus3 & AR_2040) ? ATH9K_RX_2040 : 0;



	/* directly mapped flags for ieee80211_rx_status */

	rs->flag |=

		(ads.ds_rxstatus3 & AR_GI) ? RX_FLAG_SHORT_GI : 0;

	rs->flag |=

		(ads.ds_rxstatus3 & AR_2040) ? RX_FLAG_40MHZ : 0;



	if (ads.ds_rxstatus8 & AR_PreDelimCRCErr)

		rs->rs_flags |= ATH9K_RX_DELIM_CRC_PRE;

drivers/net/wireless/ath/ath9k/mac.h

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ struct ath_rx_status { 
	u32 evm2;

	u32 evm3;

	u32 evm4;

	u32 flag; /* see enum mac80211_rx_flags */

};



struct ath_htc_rx_status {

drivers/net/wireless/ath/ath9k/recv.c

+1 −4
Original line number Diff line number Diff line
@@ -868,10 +868,7 @@ static int ath9k_process_rate(struct ath_common *common, 
	if (rx_stats->rs_rate & 0x80) {

		/* HT rate */

		rxs->flag |= RX_FLAG_HT;

		if (rx_stats->rs_flags & ATH9K_RX_2040)

			rxs->flag |= RX_FLAG_40MHZ;

		if (rx_stats->rs_flags & ATH9K_RX_GI)

			rxs->flag |= RX_FLAG_SHORT_GI;

		rxs->flag |= rx_stats->flag;

		rxs->rate_idx = rx_stats->rs_rate & 0x7f;

		return 0;

	}