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

Commit 29cee56c authored May 08, 2017 by David S. Miller

Merge tag 'mac80211-for-davem-2017-05-08' of...

Merge tag 'mac80211-for-davem-2017-05-08' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
A couple more fixes:
 * don't try to authenticate during reconfiguration, which causes
   drivers to get confused
 * fix a kernel-doc warning for a recently merged change
 * fix MU-MIMO group configuration (relevant only for monitor mode)
 * more rate flags fix: remove stray RX_ENC_FLAG_40MHZ
 * fix IBSS probe response allocation size
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents aeca3a77 6406c919

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -522,7 +522,7 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw ah, struct ath_rx_status rxs,
		rxs->rs_moreaggr = (rxsp->status11 & AR_RxMoreAggr) ? 1 : 0;
		rxs->rs_antenna = (MS(rxsp->status4, AR_RxAntenna) & 0x7);
		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->bw = (rxsp->status4 & AR_2040) ? RATE_INFO_BW_40 : RATE_INFO_BW_20;

		rxs->evm0 = rxsp->status6;
		rxs->evm1 = rxsp->status7;

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -580,8 +580,8 @@ int ath9k_hw_rxprocdesc(struct ath_hw ah, struct ath_desc ds,
		/* directly mapped flags for ieee80211_rx_status */
		rs->enc_flags \|=
		(ads.ds_rxstatus3 & AR_GI) ? RX_ENC_FLAG_SHORT_GI : 0;
		rs->enc_flags \|=
		(ads.ds_rxstatus3 & AR_2040) ? RX_ENC_FLAG_40MHZ : 0;
		rs->bw = (ads.ds_rxstatus3 & AR_2040) ? RATE_INFO_BW_40 :
		RATE_INFO_BW_20;
		if (AR_SREV_9280_20_OR_LATER(ah))
		rs->enc_flags \|=
		(ads.ds_rxstatus3 & AR_STBC) ?

drivers/net/wireless/intel/iwlegacy/4965-mac.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -734,7 +734,9 @@ il4965_hdl_rx(struct il_priv il, struct il_rx_buf rxb)
		if (rate_n_flags & RATE_MCS_HT_MSK)
		rx_status.encoding = RX_ENC_HT;
		if (rate_n_flags & RATE_MCS_HT40_MSK)
		rx_status.enc_flags \|= RX_ENC_FLAG_40MHZ;
		rx_status.bw = RATE_INFO_BW_40;
		else
		rx_status.bw = RATE_INFO_BW_20;
		if (rate_n_flags & RATE_MCS_SGI_MSK)
		rx_status.enc_flags \|= RX_ENC_FLAG_SHORT_GI;

drivers/net/wireless/intel/iwlwifi/dvm/rx.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -889,7 +889,9 @@ static void iwlagn_rx_reply_rx(struct iwl_priv *priv,
		if (rate_n_flags & RATE_MCS_HT_MSK)
		rx_status.encoding = RX_ENC_HT;
		if (rate_n_flags & RATE_MCS_HT40_MSK)
		rx_status.enc_flags \|= RX_ENC_FLAG_40MHZ;
		rx_status.bw = RATE_INFO_BW_40;
		else
		rx_status.bw = RATE_INFO_BW_20;
		if (rate_n_flags & RATE_MCS_SGI_MSK)
		rx_status.enc_flags \|= RX_ENC_FLAG_SHORT_GI;
		if (rate_n_flags & RATE_MCS_GF_MSK)

drivers/net/wireless/mac80211_hwsim.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -1201,7 +1201,13 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw,
		rx_status.encoding = RX_ENC_HT;
		}
		if (info->control.rates[0].flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
		rx_status.enc_flags \|= RX_ENC_FLAG_40MHZ;
		rx_status.bw = RATE_INFO_BW_40;
		else if (info->control.rates[0].flags & IEEE80211_TX_RC_80_MHZ_WIDTH)
		rx_status.bw = RATE_INFO_BW_80;
		else if (info->control.rates[0].flags & IEEE80211_TX_RC_160_MHZ_WIDTH)
		rx_status.bw = RATE_INFO_BW_160;
		else
		rx_status.bw = RATE_INFO_BW_20;
		if (info->control.rates[0].flags & IEEE80211_TX_RC_SHORT_GI)
		rx_status.enc_flags \|= RX_ENC_FLAG_SHORT_GI;
		/* TODO: simulate real signal strength (and optional packet loss) */