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

Commit 7fdd69c5 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: clean up rate encoding bits in RX status 



In preparation for adding support for HE rates, clean up
the driver report encoding for rate/bandwidth reporting
on RX frames.

Much of this patch was done with the following spatch:

@@
expression status;
@@
-status->flag & (RX_FLAG_HT | RX_FLAG_VHT)
+status->enc_flags & (RX_ENC_FLAG_HT | RX_ENC_FLAG_VHT)

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_SHORTPRE
+status->enc_flags op RX_ENC_FLAG_SHORTPRE
@@
expression status;
@@
-status->flag & RX_FLAG_SHORTPRE
+status->enc_flags & RX_ENC_FLAG_SHORTPRE

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_HT
+status->enc_flags op RX_ENC_FLAG_HT
@@
expression status;
@@
-status->flag & RX_FLAG_HT
+status->enc_flags & RX_ENC_FLAG_HT

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_40MHZ
+status->enc_flags op RX_ENC_FLAG_40MHZ
@@
expression status;
@@
-status->flag & RX_FLAG_40MHZ
+status->enc_flags & RX_ENC_FLAG_40MHZ

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_SHORT_GI
+status->enc_flags op RX_ENC_FLAG_SHORT_GI
@@
expression status;
@@
-status->flag & RX_FLAG_SHORT_GI
+status->enc_flags & RX_ENC_FLAG_SHORT_GI

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_HT_GF
+status->enc_flags op RX_ENC_FLAG_HT_GF
@@
expression status;
@@
-status->flag & RX_FLAG_HT_GF
+status->enc_flags & RX_ENC_FLAG_HT_GF

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_VHT
+status->enc_flags op RX_ENC_FLAG_VHT
@@
expression status;
@@
-status->flag & RX_FLAG_VHT
+status->enc_flags & RX_ENC_FLAG_VHT

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_STBC_MASK
+status->enc_flags op RX_ENC_FLAG_STBC_MASK
@@
expression status;
@@
-status->flag & RX_FLAG_STBC_MASK
+status->enc_flags & RX_ENC_FLAG_STBC_MASK

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_LDPC
+status->enc_flags op RX_ENC_FLAG_LDPC
@@
expression status;
@@
-status->flag & RX_FLAG_LDPC
+status->enc_flags & RX_ENC_FLAG_LDPC

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_10MHZ
+status->enc_flags op RX_ENC_FLAG_10MHZ
@@
expression status;
@@
-status->flag & RX_FLAG_10MHZ
+status->enc_flags & RX_ENC_FLAG_10MHZ

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_5MHZ
+status->enc_flags op RX_ENC_FLAG_5MHZ
@@
expression status;
@@
-status->flag & RX_FLAG_5MHZ
+status->enc_flags & RX_ENC_FLAG_5MHZ

@@
assignment operator op;
expression status;
@@
-status->vht_flag op RX_VHT_FLAG_80MHZ
+status->enc_flags op RX_ENC_FLAG_80MHZ
@@
expression status;
@@
-status->vht_flag & RX_VHT_FLAG_80MHZ
+status->enc_flags & RX_ENC_FLAG_80MHZ

@@
assignment operator op;
expression status;
@@
-status->vht_flag op RX_VHT_FLAG_160MHZ
+status->enc_flags op RX_ENC_FLAG_160MHZ
@@
expression status;
@@
-status->vht_flag & RX_VHT_FLAG_160MHZ
+status->enc_flags & RX_ENC_FLAG_160MHZ

@@
assignment operator op;
expression status;
@@
-status->vht_flag op RX_VHT_FLAG_BF
+status->enc_flags op RX_ENC_FLAG_BF
@@
expression status;
@@
-status->vht_flag & RX_VHT_FLAG_BF
+status->enc_flags & RX_ENC_FLAG_BF

@@
assignment operator op;
expression status, STBC;
@@
-status->flag op STBC << RX_FLAG_STBC_SHIFT
+status->enc_flags op STBC << RX_ENC_FLAG_STBC_SHIFT

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_SHORTPRE
+status.enc_flags op RX_ENC_FLAG_SHORTPRE
@@
expression status;
@@
-status.flag & RX_FLAG_SHORTPRE
+status.enc_flags & RX_ENC_FLAG_SHORTPRE

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_HT
+status.enc_flags op RX_ENC_FLAG_HT
@@
expression status;
@@
-status.flag & RX_FLAG_HT
+status.enc_flags & RX_ENC_FLAG_HT

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_40MHZ
+status.enc_flags op RX_ENC_FLAG_40MHZ
@@
expression status;
@@
-status.flag & RX_FLAG_40MHZ
+status.enc_flags & RX_ENC_FLAG_40MHZ

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_SHORT_GI
+status.enc_flags op RX_ENC_FLAG_SHORT_GI
@@
expression status;
@@
-status.flag & RX_FLAG_SHORT_GI
+status.enc_flags & RX_ENC_FLAG_SHORT_GI

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_HT_GF
+status.enc_flags op RX_ENC_FLAG_HT_GF
@@
expression status;
@@
-status.flag & RX_FLAG_HT_GF
+status.enc_flags & RX_ENC_FLAG_HT_GF

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_VHT
+status.enc_flags op RX_ENC_FLAG_VHT
@@
expression status;
@@
-status.flag & RX_FLAG_VHT
+status.enc_flags & RX_ENC_FLAG_VHT

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_STBC_MASK
+status.enc_flags op RX_ENC_FLAG_STBC_MASK
@@
expression status;
@@
-status.flag & RX_FLAG_STBC_MASK
+status.enc_flags & RX_ENC_FLAG_STBC_MASK

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_LDPC
+status.enc_flags op RX_ENC_FLAG_LDPC
@@
expression status;
@@
-status.flag & RX_FLAG_LDPC
+status.enc_flags & RX_ENC_FLAG_LDPC

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_10MHZ
+status.enc_flags op RX_ENC_FLAG_10MHZ
@@
expression status;
@@
-status.flag & RX_FLAG_10MHZ
+status.enc_flags & RX_ENC_FLAG_10MHZ

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_5MHZ
+status.enc_flags op RX_ENC_FLAG_5MHZ
@@
expression status;
@@
-status.flag & RX_FLAG_5MHZ
+status.enc_flags & RX_ENC_FLAG_5MHZ

@@
assignment operator op;
expression status;
@@
-status.vht_flag op RX_VHT_FLAG_80MHZ
+status.enc_flags op RX_ENC_FLAG_80MHZ
@@
expression status;
@@
-status.vht_flag & RX_VHT_FLAG_80MHZ
+status.enc_flags & RX_ENC_FLAG_80MHZ

@@
assignment operator op;
expression status;
@@
-status.vht_flag op RX_VHT_FLAG_160MHZ
+status.enc_flags op RX_ENC_FLAG_160MHZ
@@
expression status;
@@
-status.vht_flag & RX_VHT_FLAG_160MHZ
+status.enc_flags & RX_ENC_FLAG_160MHZ

@@
assignment operator op;
expression status;
@@
-status.vht_flag op RX_VHT_FLAG_BF
+status.enc_flags op RX_ENC_FLAG_BF
@@
expression status;
@@
-status.vht_flag & RX_VHT_FLAG_BF
+status.enc_flags & RX_ENC_FLAG_BF

@@
assignment operator op;
expression status, STBC;
@@
-status.flag op STBC << RX_FLAG_STBC_SHIFT
+status.enc_flags op STBC << RX_ENC_FLAG_STBC_SHIFT

@@
@@
-RX_FLAG_STBC_SHIFT
+RX_ENC_FLAG_STBC_SHIFT

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e5f2e067

drivers/net/wireless/ath/ath10k/htt_rx.c

+23 −23
Original line number Diff line number Diff line
@@ -632,11 +632,11 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar, 
		sgi = (info3 >> 7) & 1;



		status->rate_idx = mcs;

		status->flag |= RX_FLAG_HT;

		status->enc_flags |= RX_ENC_FLAG_HT;

		if (sgi)

			status->flag |= RX_FLAG_SHORT_GI;

			status->enc_flags |= RX_ENC_FLAG_SHORT_GI;

		if (bw)

			status->flag |= RX_FLAG_40MHZ;

			status->enc_flags |= RX_ENC_FLAG_40MHZ;

		break;

	case HTT_RX_VHT:

	case HTT_RX_VHT_WITH_TXBF:
@@ -692,7 +692,7 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar, 
		status->vht_nss = nss;



		if (sgi)

			status->flag |= RX_FLAG_SHORT_GI;

			status->enc_flags |= RX_ENC_FLAG_SHORT_GI;



		switch (bw) {

		/* 20MHZ */
@@ -700,18 +700,18 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar, 
			break;

		/* 40MHZ */

		case 1:

			status->flag |= RX_FLAG_40MHZ;

			status->enc_flags |= RX_ENC_FLAG_40MHZ;

			break;

		/* 80MHZ */

		case 2:

			status->vht_flag |= RX_VHT_FLAG_80MHZ;

			status->enc_flags |= RX_ENC_FLAG_80MHZ;

			break;

		case 3:

			status->vht_flag |= RX_VHT_FLAG_160MHZ;

			status->enc_flags |= RX_ENC_FLAG_160MHZ;

			break;

		}



		status->flag |= RX_FLAG_VHT;

		status->enc_flags |= RX_ENC_FLAG_VHT;

		break;

	default:

		break;
@@ -875,12 +875,12 @@ static void ath10k_htt_rx_h_ppdu(struct ath10k *ar, 
		status->freq = 0;

		status->rate_idx = 0;

		status->vht_nss = 0;

		status->vht_flag &= ~RX_VHT_FLAG_80MHZ;

		status->flag &= ~(RX_FLAG_HT |

				  RX_FLAG_VHT |

				  RX_FLAG_SHORT_GI |

				  RX_FLAG_40MHZ |

				  RX_FLAG_MACTIME_END);

		status->enc_flags &= ~(RX_ENC_FLAG_HT |

				       RX_ENC_FLAG_VHT |

				       RX_ENC_FLAG_SHORT_GI |

				       RX_ENC_FLAG_40MHZ |

				       RX_ENC_FLAG_80MHZ);

		status->flag &= ~RX_FLAG_MACTIME_END;

		status->flag |= RX_FLAG_NO_SIGNAL_VAL;



		ath10k_htt_rx_h_signal(ar, status, rxd);
@@ -933,7 +933,7 @@ static void ath10k_process_rx(struct ath10k *ar, 
	*status = *rx_status;



	ath10k_dbg(ar, ATH10K_DBG_DATA,

		   "rx skb %pK len %u peer %pM %s %s sn %u %s%s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%llx fcs-err %i mic-err %i amsdu-more %i\n",

		   "rx skb %pK len %u peer %pM %s %s sn %u %s%s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n",

		   skb,

		   skb->len,

		   ieee80211_get_SA(hdr),
@@ -941,14 +941,14 @@ static void ath10k_process_rx(struct ath10k *ar, 
		   is_multicast_ether_addr(ieee80211_get_DA(hdr)) ?

							"mcast" : "ucast",

		   (__le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4,

		   (status->flag & (RX_FLAG_HT | RX_FLAG_VHT)) == 0 ?

		   (status->enc_flags & (RX_ENC_FLAG_HT | RX_ENC_FLAG_VHT)) == 0 ?

		   "legacy" : "",

		   status->flag & RX_FLAG_HT ? "ht" : "",

		   status->flag & RX_FLAG_VHT ? "vht" : "",

		   status->flag & RX_FLAG_40MHZ ? "40" : "",

		   status->vht_flag & RX_VHT_FLAG_80MHZ ? "80" : "",

		   status->vht_flag & RX_VHT_FLAG_160MHZ ? "160" : "",

		   status->flag & RX_FLAG_SHORT_GI ? "sgi " : "",

		   status->enc_flags & RX_ENC_FLAG_HT ? "ht" : "",

		   status->enc_flags & RX_ENC_FLAG_VHT ? "vht" : "",

		   status->enc_flags & RX_ENC_FLAG_40MHZ ? "40" : "",

		   status->enc_flags & RX_ENC_FLAG_80MHZ ? "80" : "",

		   status->enc_flags & RX_ENC_FLAG_160MHZ ? "160" : "",

		   status->enc_flags & RX_ENC_FLAG_SHORT_GI ? "sgi " : "",

		   status->rate_idx,

		   status->vht_nss,

		   status->freq,

drivers/net/wireless/ath/ath5k/base.c

+3 −3
Original line number Diff line number Diff line
@@ -1414,10 +1414,10 @@ ath5k_receive_frame(struct ath5k_hw *ah, struct sk_buff *skb, 
	rxs->flag |= ath5k_rx_decrypted(ah, skb, rs);

	switch (ah->ah_bwmode) {

	case AR5K_BWMODE_5MHZ:

		rxs->flag |= RX_FLAG_5MHZ;

		rxs->enc_flags |= RX_ENC_FLAG_5MHZ;

		break;

	case AR5K_BWMODE_10MHZ:

		rxs->flag |= RX_FLAG_10MHZ;

		rxs->enc_flags |= RX_ENC_FLAG_10MHZ;

		break;

	default:

		break;
@@ -1425,7 +1425,7 @@ ath5k_receive_frame(struct ath5k_hw *ah, struct sk_buff *skb, 


	if (rs->rs_rate ==

	    ah->sbands[ah->curchan->band].bitrates[rxs->rate_idx].hw_value_short)

		rxs->flag |= RX_FLAG_SHORTPRE;

		rxs->enc_flags |= RX_ENC_FLAG_SHORTPRE;



	trace_ath5k_rx(ah, skb);

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

+3 −3
Original line number Diff line number Diff line
@@ -494,7 +494,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->enc_flags = 0;



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

	rxs->rs_tstamp =  rxsp->status3;
@@ -520,8 +520,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->flag  |= (rxsp->status4 & AR_GI) ? RX_FLAG_SHORT_GI : 0;

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

	rxs->enc_flags |= (rxsp->status4 & AR_GI) ? RX_ENC_FLAG_SHORT_GI : 0;

	rxs->enc_flags |= (rxsp->status4 & AR_2040) ? RX_ENC_FLAG_40MHZ : 0;



	rxs->evm0 = rxsp->status6;

	rxs->evm1 = rxsp->status7;

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

+4 −5
Original line number Diff line number Diff line
@@ -181,14 +181,13 @@ int ath9k_cmn_process_rate(struct ath_common *common, 
	sband = hw->wiphy->bands[band];



	if (IS_CHAN_QUARTER_RATE(ah->curchan))

		rxs->flag |= RX_FLAG_5MHZ;

		rxs->enc_flags |= RX_ENC_FLAG_5MHZ;

	else if (IS_CHAN_HALF_RATE(ah->curchan))

		rxs->flag |= RX_FLAG_10MHZ;

		rxs->enc_flags |= RX_ENC_FLAG_10MHZ;



	if (rx_stats->rs_rate & 0x80) {

		/* HT rate */

		rxs->flag |= RX_FLAG_HT;

		rxs->flag |= rx_stats->flag;

		rxs->enc_flags |= RX_ENC_FLAG_HT | rx_stats->enc_flags;

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

		return 0;

	}
@@ -199,7 +198,7 @@ int ath9k_cmn_process_rate(struct ath_common *common, 
			return 0;

		}

		if (sband->bitrates[i].hw_value_short == rx_stats->rs_rate) {

			rxs->flag |= RX_FLAG_SHORTPRE;

			rxs->enc_flags |= RX_ENC_FLAG_SHORTPRE;

			rxs->rate_idx = i;

			return 0;

		}

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

+3 −3
Original line number Diff line number Diff line
@@ -116,12 +116,12 @@ void ath_debug_rate_stats(struct ath_softc *sc, 
		if (rxs->rate_idx >= ARRAY_SIZE(rstats->ht_stats))

			goto exit;



		if (rxs->flag & RX_FLAG_40MHZ)

		if (rxs->enc_flags & RX_ENC_FLAG_40MHZ)

			rstats->ht_stats[rxs->rate_idx].ht40_cnt++;

		else

			rstats->ht_stats[rxs->rate_idx].ht20_cnt++;



		if (rxs->flag & RX_FLAG_SHORT_GI)

		if (rxs->enc_flags & RX_ENC_FLAG_SHORT_GI)

			rstats->ht_stats[rxs->rate_idx].sgi_cnt++;

		else

			rstats->ht_stats[rxs->rate_idx].lgi_cnt++;
@@ -130,7 +130,7 @@ void ath_debug_rate_stats(struct ath_softc *sc, 
	}



	if (IS_CCK_RATE(rs->rs_rate)) {

		if (rxs->flag & RX_FLAG_SHORTPRE)

		if (rxs->enc_flags & RX_ENC_FLAG_SHORTPRE)

			rstats->cck_stats[rxs->rate_idx].cck_sp_cnt++;

		else

			rstats->cck_stats[rxs->rate_idx].cck_lp_cnt++;