Commit 294e70c9 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'mac80211-next-for-net-next-2021-12-21' of... 

Merge tag 'mac80211-next-for-net-next-2021-12-21' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
This time we have:
 * ndo_fill_forward_path support in mac80211, to let drivers use it
 * association comeback notification for userspace, to be able
   to react more sensibly to long delays
 * support for background radar detection hardware in some chipsets
 * SA Query Procedures offload on the AP side
 * more logging if we find problems with HT/VHT/HE
 * various cleanups and minor fixes

Conflicts:

net/wireless/reg.c:
  e08ebd6d ("cfg80211: Acquire wiphy mutex on regulatory work")
  701fdfe3 ("cfg80211: Enable regulatory enforcement checks for drivers supporting mesh iface")
  https://lore.kernel.org/r/20211221111950.57ecc6a7@canb.auug.org.au

drivers/net/wireless/ath/ath10k/wmi.c:
  7f599aec ("cfg80211: Use the HE operation IE to determine a 6GHz BSS channel")
  3bf2537e ("ath10k: drop beacon and probe response which leak from other channel")
  https://lore.kernel.org/r/20211221115004.1cd6b262@canb.auug.org.au

* tag 'mac80211-next-for-net-next-2021-12-21' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next: (32 commits)
  cfg80211: Enable regulatory enforcement checks for drivers supporting mesh iface
  rfkill: allow to get the software rfkill state
  cfg80211: refactor cfg80211_get_ies_channel_number()
  nl82011: clarify interface combinations wrt. channels
  nl80211: Add support to offload SA Query procedures for AP SME device
  nl80211: Add support to set AP settings flags with single attribute
  mac80211: add more HT/VHT/HE state logging
  cfg80211: Use the HE operation IE to determine a 6GHz BSS channel
  cfg80211: rename offchannel_chain structs to background_chain to avoid confusion with ETSI standard
  mac80211: Notify cfg80211 about association comeback
  cfg80211: Add support for notifying association comeback
  mac80211: introduce channel switch disconnect function
  cfg80211: Fix order of enum nl80211_band_iftype_attr documentation
  cfg80211: simplify cfg80211_chandef_valid()
  mac80211: Remove a couple of obsolete TODO
  mac80211: fix FEC flag in radio tap header
  mac80211: use coarse boottime for airtime fairness code
  ieee80211: change HE nominal packet padding value defines
  cfg80211: use ieee80211_bss_get_elem() instead of _get_ie()
  mac80211: Use memset_after() to clear tx status
  ...
====================

Link: https://lore.kernel.org/r/20211221112532.28708-1-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c48c94b0 701fdfe3

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

+7 −1
Original line number Diff line number Diff line
@@ -2613,6 +2613,7 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb) 
	if (ieee80211_is_beacon(hdr->frame_control) ||

	    ieee80211_is_probe_resp(hdr->frame_control)) {

		struct ieee80211_mgmt *mgmt = (void *)skb->data;

		enum cfg80211_bss_frame_type ftype;

		u8 *ies;

		int ies_ch;
@@ -2623,9 +2624,14 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb) 


		ies = mgmt->u.beacon.variable;



		if (ieee80211_is_beacon(mgmt->frame_control))

			ftype = CFG80211_BSS_FTYPE_BEACON;

		else

			ftype = CFG80211_BSS_FTYPE_PRESP;



		ies_ch = cfg80211_get_ies_channel_number(mgmt->u.beacon.variable,

							 skb_tail_pointer(skb) - ies,

							 sband->band);

							 sband->band, ftype);



		if (ies_ch > 0 && ies_ch != channel) {

			ath10k_dbg(ar, ATH10K_DBG_MGMT,

drivers/net/wireless/ath/carl9170/tx.c

+6 −6
Original line number Diff line number Diff line
@@ -275,12 +275,12 @@ static void carl9170_tx_release(struct kref *ref) 
	if (WARN_ON_ONCE(!ar))

		return;



	BUILD_BUG_ON(

	    offsetof(struct ieee80211_tx_info, status.ack_signal) != 20);



	memset(&txinfo->status.ack_signal, 0,

	       sizeof(struct ieee80211_tx_info) -

	       offsetof(struct ieee80211_tx_info, status.ack_signal));

	/*

	 * This does not call ieee80211_tx_info_clear_status() because

	 * carl9170_tx_fill_rateinfo() has filled the rate information

	 * before we get to this point.

	 */

	memset_after(&txinfo->status, 0, rates);



	if (atomic_read(&ar->tx_total_queued))

		ar->tx_schedule = true;

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

+4 −2
Original line number Diff line number Diff line
@@ -608,7 +608,8 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
				.phy_cap_info[9] =

					IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB |

					IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB |

					IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED,

					(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED <<

					IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_POS),

				.phy_cap_info[10] =

					IEEE80211_HE_PHY_CAP10_HE_MU_M1RU_MAX_LTF,

			},
@@ -665,7 +666,8 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
					IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI |

					IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_242,

				.phy_cap_info[9] =

					IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED,

					IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED

					<< IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_POS,

			},

			/*

			 * Set default Tx/Rx HE MCS NSS Support field.

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

+8 −8
Original line number Diff line number Diff line
@@ -2209,24 +2209,24 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm, 
		}



		flags |= STA_CTXT_HE_PACKET_EXT;

	} else if ((sta->he_cap.he_cap_elem.phy_cap_info[9] &

		    IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK) !=

		  IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED) {

	} else if (u8_get_bits(sta->he_cap.he_cap_elem.phy_cap_info[9],

			       IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK)

		   != IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED) {

		int low_th = -1;

		int high_th = -1;



		/* Take the PPE thresholds from the nominal padding info */

		switch (sta->he_cap.he_cap_elem.phy_cap_info[9] &

			IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK) {

		case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_0US:

		switch (u8_get_bits(sta->he_cap.he_cap_elem.phy_cap_info[9],

				    IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK)) {

		case IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_0US:

			low_th = IWL_HE_PKT_EXT_NONE;

			high_th = IWL_HE_PKT_EXT_NONE;

			break;

		case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_8US:

		case IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_8US:

			low_th = IWL_HE_PKT_EXT_BPSK;

			high_th = IWL_HE_PKT_EXT_NONE;

			break;

		case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US:

		case IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US:

			low_th = IWL_HE_PKT_EXT_NONE;

			high_th = IWL_HE_PKT_EXT_BPSK;

			break;

drivers/net/wireless/intersil/p54/txrx.c

+1 −5
Original line number Diff line number Diff line
@@ -431,11 +431,7 @@ static void p54_rx_frame_sent(struct p54_common *priv, struct sk_buff *skb) 
	 * Clear manually, ieee80211_tx_info_clear_status would

	 * clear the counts too and we need them.

	 */

	memset(&info->status.ack_signal, 0,

	       sizeof(struct ieee80211_tx_info) -

	       offsetof(struct ieee80211_tx_info, status.ack_signal));

	BUILD_BUG_ON(offsetof(struct ieee80211_tx_info,

			      status.ack_signal) != 20);

	memset_after(&info->status, 0, rates);



	if (entry_hdr->flags & cpu_to_le16(P54_HDR_FLAG_DATA_ALIGN))

		pad = entry_data->align[0];