Commit 35f4962c authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: clean up rate info bandwidth setting 



There's no need to do the same thing three times in
the different switch cases, pull that out to a single
place.

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

net/mac80211/util.c

+2 −4
Original line number Diff line number Diff line
@@ -2793,12 +2793,13 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, 


	memset(&ri, 0, sizeof(ri));



	ri.bw = status->bw;



	/* Fill cfg80211 rate info */

	switch (status->encoding) {

	case RX_ENC_HT:

		ri.mcs = status->rate_idx;

		ri.flags |= RATE_INFO_FLAGS_MCS;

		ri.bw = status->bw;

		if (status->enc_flags & RX_ENC_FLAG_SHORT_GI)

			ri.flags |= RATE_INFO_FLAGS_SHORT_GI;

		break;
@@ -2806,7 +2807,6 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, 
		ri.flags |= RATE_INFO_FLAGS_VHT_MCS;

		ri.mcs = status->rate_idx;

		ri.nss = status->nss;

		ri.bw = status->bw;

		if (status->enc_flags & RX_ENC_FLAG_SHORT_GI)

			ri.flags |= RATE_INFO_FLAGS_SHORT_GI;

		break;
@@ -2818,8 +2818,6 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, 
		int shift = 0;

		int bitrate;



		ri.bw = status->bw;



		switch (status->bw) {

		case RATE_INFO_BW_10:

			shift = 1;