Commit b8d06ce7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-for-net-2022-03-01' of... 

Merge tag 'wireless-for-net-2022-03-01' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless



johannes Berg says:

====================

Some last-minute fixes:
 * rfkill
   - add missing rfill_soft_blocked() when disabled

 * cfg80211
   - handle a nla_memdup() failure correctly
   - fix CONFIG_CFG80211_EXTRA_REGDB_KEYDIR typo in
     Makefile

 * mac80211
   - fix EAPOL handling in 802.3 RX path
   - reject setting up aggregation sessions before
     connection is authorized to avoid timeouts or
     similar
   - handle some SAE authentication steps correctly
   - fix AC selection in mesh forwarding

 * iwlwifi
   - remove TWT support as it causes firmware crashes
     when the AP isn't behaving correctly
   - check debugfs pointer before dereferncing it
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7cf5aa32 a12f7634

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

+1 −2
Original line number Diff line number Diff line
@@ -553,8 +553,7 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
			.has_he = true,

			.he_cap_elem = {

				.mac_cap_info[0] =

					IEEE80211_HE_MAC_CAP0_HTC_HE |

					IEEE80211_HE_MAC_CAP0_TWT_REQ,

					IEEE80211_HE_MAC_CAP0_HTC_HE,

				.mac_cap_info[1] =

					IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US |

					IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8,

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

+8 −3
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 */

#include <linux/vmalloc.h>

#include <linux/err.h>

#include <linux/ieee80211.h>

#include <linux/netdevice.h>
@@ -1857,7 +1858,6 @@ void iwl_mvm_sta_add_debugfs(struct ieee80211_hw *hw, 
void iwl_mvm_dbgfs_register(struct iwl_mvm *mvm)

{

	struct dentry *bcast_dir __maybe_unused;

	char buf[100];



	spin_lock_init(&mvm->drv_stats_lock);
@@ -1939,6 +1939,11 @@ void iwl_mvm_dbgfs_register(struct iwl_mvm *mvm) 
	 * Create a symlink with mac80211. It will be removed when mac80211

	 * exists (before the opmode exists which removes the target.)

	 */

	if (!IS_ERR(mvm->debugfs_dir)) {

		char buf[100];



		snprintf(buf, 100, "../../%pd2", mvm->debugfs_dir->d_parent);

	debugfs_create_symlink("iwlwifi", mvm->hw->wiphy->debugfsdir, buf);

		debugfs_create_symlink("iwlwifi", mvm->hw->wiphy->debugfsdir,

				       buf);

	}

}

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

+0 −1
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ static const u8 he_if_types_ext_capa_sta[] = { 
	 [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING,

	 [2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT,

	 [7] = WLAN_EXT_CAPA8_OPMODE_NOTIF,

	 [9] = WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT,

};



static const struct wiphy_iftype_ext_capab he_iftypes_ext_capa[] = {

include/linux/rfkill.h

+5 −0
Original line number Diff line number Diff line
@@ -308,6 +308,11 @@ static inline bool rfkill_blocked(struct rfkill *rfkill) 
	return false;

}



static inline bool rfkill_soft_blocked(struct rfkill *rfkill)

{

	return false;

}



static inline enum rfkill_type rfkill_find_type(const char *name)

{

	return RFKILL_TYPE_ALL;

net/mac80211/agg-tx.c

+9 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 * Copyright 2007, Michael Wu <flamingice@sourmilk.net>

 * Copyright 2007-2010, Intel Corporation

 * Copyright(c) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018 - 2021 Intel Corporation

 * Copyright (C) 2018 - 2022 Intel Corporation

 */



#include <linux/ieee80211.h>
@@ -626,6 +626,14 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, 
		return -EINVAL;

	}



	if (test_sta_flag(sta, WLAN_STA_MFP) &&

	    !test_sta_flag(sta, WLAN_STA_AUTHORIZED)) {

		ht_dbg(sdata,

		       "MFP STA not authorized - deny BA session request %pM tid %d\n",

		       sta->sta.addr, tid);

		return -EINVAL;

	}



	/*

	 * 802.11n-2009 11.5.1.1: If the initiating STA is an HT STA, is a

	 * member of an IBSS, and has no other existing Block Ack agreement