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

Commit 7b1dd048 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: mvm: propagate LDPC / STBC status to radiotap 



This will allow to get sniffer captures with correct
settings for these HT / VHT capabilities.
Also set the corresponding HAVE_MCS / VHT_KNOWN bits in
the registration to mac80211.

Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent e5209263

drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h

+2 −1
Original line number Diff line number Diff line
@@ -257,7 +257,8 @@ enum { 


/* Bit 17-18: (0) SS, (1) SS*2 */

#define RATE_MCS_STBC_POS		17

#define RATE_MCS_STBC_MSK		(1 << RATE_MCS_STBC_POS)

#define RATE_MCS_HT_STBC_MSK		(3 << RATE_MCS_STBC_POS)

#define RATE_MCS_VHT_STBC_MSK		(1 << RATE_MCS_STBC_POS)



/* Bit 19: (0) Beamforming is off, (1) Beamforming is on */

#define RATE_MCS_BF_POS			19

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+4 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
#include <linux/ip.h>

#include <linux/if_arp.h>

#include <net/mac80211.h>

#include <net/ieee80211_radiotap.h>

#include <net/tcp.h>



#include "iwl-op-mode.h"
@@ -280,6 +281,9 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 


	hw->queues = mvm->first_agg_queue;

	hw->offchannel_tx_hw_queue = IWL_MVM_OFFCHANNEL_QUEUE;

	hw->radiotap_mcs_details |= IEEE80211_RADIOTAP_MCS_HAVE_FEC |

				    IEEE80211_RADIOTAP_MCS_HAVE_STBC;

	hw->radiotap_vht_details |= IEEE80211_RADIOTAP_VHT_KNOWN_STBC;

	hw->rate_control_algorithm = "iwl-mvm-rs";



	/*

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

+1 −1
Original line number Diff line number Diff line
@@ -2595,7 +2595,7 @@ static int rs_pretty_print_rate(char *buf, const u32 rate) 
	return sprintf(buf, "%s | ANT: %s BW: %s MCS: %d NSS: %d %s%s%s%s%s\n",

		       type, rs_pretty_ant(ant), bw, mcs, nss,

		       (rate & RATE_MCS_SGI_MSK) ? "SGI " : "NGI ",

		       (rate & RATE_MCS_STBC_MSK) ? "STBC " : "",

		       (rate & RATE_MCS_HT_STBC_MSK) ? "STBC " : "",

		       (rate & RATE_MCS_LDPC_MSK) ? "LDPC " : "",

		       (rate & RATE_MCS_BF_MSK) ? "BF " : "",

		       (rate & RATE_MCS_ZLF_MSK) ? "ZLF " : "");

drivers/net/wireless/iwlwifi/mvm/rx.c

+8 −0
Original line number Diff line number Diff line
@@ -368,15 +368,23 @@ int iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb, 
		rx_status.flag |= RX_FLAG_SHORT_GI;

	if (rate_n_flags & RATE_HT_MCS_GF_MSK)

		rx_status.flag |= RX_FLAG_HT_GF;

	if (rate_n_flags & RATE_MCS_LDPC_MSK)

		rx_status.flag |= RX_FLAG_LDPC;

	if (rate_n_flags & RATE_MCS_HT_MSK) {

		u8 stbc = (rate_n_flags & RATE_MCS_HT_STBC_MSK) >>

				RATE_MCS_STBC_POS;

		rx_status.flag |= RX_FLAG_HT;

		rx_status.rate_idx = rate_n_flags & RATE_HT_MCS_INDEX_MSK;

		rx_status.flag |= stbc << RX_FLAG_STBC_SHIFT;

	} else if (rate_n_flags & RATE_MCS_VHT_MSK) {

		u8 stbc = (rate_n_flags & RATE_MCS_VHT_STBC_MSK) >>

				RATE_MCS_STBC_POS;

		rx_status.vht_nss =

			((rate_n_flags & RATE_VHT_MCS_NSS_MSK) >>

						RATE_VHT_MCS_NSS_POS) + 1;

		rx_status.rate_idx = rate_n_flags & RATE_VHT_MCS_RATE_CODE_MSK;

		rx_status.flag |= RX_FLAG_VHT;

		rx_status.flag |= stbc << RX_FLAG_STBC_SHIFT;

	} else {

		rx_status.rate_idx =

			iwl_mvm_legacy_rate_to_mac80211_idx(rate_n_flags,