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

Commit a7b8b2ca authored Nov 07, 2013 by Eyal Shapira Committed by Emmanuel Grumbach Dec 09, 2013

iwlwifi: fix check for a single rx antenna



valid_rx_ant is a bitmask of available antennas and not the number
of Rx antennas. Use num_of_ant and remove duplicate definitions
in both dvm and mvm.

Signed-off-by: Eyal Shapira <eyal@wizery.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

parent 84c317c9

drivers/net/wireless/iwlwifi/dvm/rs.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -389,13 +389,6 @@ struct iwl_lq_sta {
		u8 last_bt_traffic;
		};

		static inline u8 num_of_ant(u8 mask)
		{
		return !!((mask) & ANT_A) +
		!!((mask) & ANT_B) +
		!!((mask) & ANT_C);
		}

		static inline u8 first_antenna(u8 mask)
		{
		if (mask & ANT_A)

drivers/net/wireless/iwlwifi/iwl-config.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,12 @@ enum iwl_led_mode {
		#define ANT_BC (ANT_B \| ANT_C)
		#define ANT_ABC (ANT_A \| ANT_B \| ANT_C)

		static inline u8 num_of_ant(u8 mask)
		{
		return !!((mask) & ANT_A) +
		!!((mask) & ANT_B) +
		!!((mask) & ANT_C);
		}

		/*
		* @max_ll_items: max number of OTP blocks

drivers/net/wireless/iwlwifi/iwl-nvm-parse.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -283,7 +283,8 @@ static void iwl_init_vht_hw_capab(const struct iwl_cfg *cfg,
		IEEE80211_VHT_MCS_NOT_SUPPORTED << 12 \|
		IEEE80211_VHT_MCS_NOT_SUPPORTED << 14);

		if (data->valid_rx_ant == 1 \|\| cfg->rx_with_siso_diversity) {
		if (num_of_ant(data->valid_rx_ant) == 1 \|\|
		cfg->rx_with_siso_diversity) {
		vht_cap->cap \|= IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN \|
		IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN;
		/* this works because NOT_SUPPORTED == 3 */

drivers/net/wireless/iwlwifi/mvm/rs.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -343,14 +343,6 @@ enum iwl_bt_coex_profile_traffic_load {
		*/
		};


		static inline u8 num_of_ant(u8 mask)
		{
		return !!((mask) & ANT_A) +
		!!((mask) & ANT_B) +
		!!((mask) & ANT_C);
		}

		/* Initialize station's rate scaling information after adding station */
		void iwl_mvm_rs_rate_init(struct iwl_mvm mvm, struct ieee80211_sta sta,
		enum ieee80211_band band, bool init);