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

Merge tag 'wireless-next-2022-03-18' of... 

Merge tag 'wireless-next-2022-03-18' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next



Kalle Valo says:

====================
wireless-next patches for v5.18

Third set of patches for v5.18. Smaller set this time, support for
mt7921u and some work on MBSSID support. Also a workaround for rfkill
userspace event.

Major changes:

mac80211

* MBSSID beacon handling in AP mode

rfkill

* make new event layout opt-in to workaround buggy user space

rtlwifi

* support On Networks N150 device id

mt76

* mt7915: MBSSID and 6 GHz band support

* new driver mt7921u
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e913c09d 54f586a9

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -15938,8 +15938,8 @@ M: Kalle Valo <kvalo@kernel.org> 
L:	ath11k@lists.infradead.org

S:	Supported

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

F:	Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml

F:	drivers/net/wireless/ath/ath11k/

F:	Documentation/devicetree/bindings/net/wireless/qcom,ath11k.txt









QUALCOMM ATHEROS ATH9K WIRELESS DRIVER









M:	Toke Høiland-Jørgensen <toke@toke.dk>
































drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c



+4
−4






























Original line number
Diff line number
Diff line







@@ -90,8 +90,8 @@







#define P2PSD_ACTION_CATEGORY		0x04	/* Public action frame */









#define P2PSD_ACTION_ID_GAS_IREQ	0x0a	/* GAS Initial Request AF */









#define P2PSD_ACTION_ID_GAS_IRESP	0x0b	/* GAS Initial Response AF */









#define P2PSD_ACTION_ID_GAS_CREQ	0x0c	/* GAS Comback Request AF */









#define P2PSD_ACTION_ID_GAS_CRESP	0x0d	/* GAS Comback Response AF */









#define P2PSD_ACTION_ID_GAS_CREQ	0x0c	/* GAS Comeback Request AF */









#define P2PSD_ACTION_ID_GAS_CRESP	0x0d	/* GAS Comeback Response AF */



















#define BRCMF_P2P_DISABLE_TIMEOUT	msecs_to_jiffies(500)


















@@ -396,11 +396,11 @@ static void brcmf_p2p_print_actframe(bool tx, void *frame, u32 frame_len)







				  (tx) ? "TX" : "RX");









			break;









		case P2PSD_ACTION_ID_GAS_CREQ:









			brcmf_dbg(TRACE, "%s P2P GAS Comback Request\n",









			brcmf_dbg(TRACE, "%s P2P GAS Comeback Request\n",









				  (tx) ? "TX" : "RX");









			break;









		case P2PSD_ACTION_ID_GAS_CRESP:









			brcmf_dbg(TRACE, "%s P2P GAS Comback Response\n",









			brcmf_dbg(TRACE, "%s P2P GAS Comeback Response\n",









				  (tx) ? "TX" : "RX");









			break;









		default:
































drivers/net/wireless/cisco/airo.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -545,7 +545,7 @@ struct ConfigRid {







#define MODE_CFG_MASK cpu_to_le16(0xff)









#define MODE_ETHERNET_HOST cpu_to_le16(0<<8) /* rx payloads converted */









#define MODE_LLC_HOST cpu_to_le16(1<<8) /* rx payloads left as is */









#define MODE_AIRONET_EXTEND cpu_to_le16(1<<9) /* enable Aironet extenstions */









#define MODE_AIRONET_EXTEND cpu_to_le16(1<<9) /* enable Aironet extensions */









#define MODE_AP_INTERFACE cpu_to_le16(1<<10) /* enable ap interface extensions */









#define MODE_ANTENNA_ALIGN cpu_to_le16(1<<11) /* enable antenna alignment */









#define MODE_ETHER_LLC cpu_to_le16(1<<12) /* enable ethernet LLC */
































drivers/net/wireless/intel/iwlwifi/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -139,6 +139,7 @@ config IWLMEI







	tristate "Intel Management Engine communication over WLAN"









	depends on INTEL_MEI









	depends on PM









	depends on CFG80211









	help









	  Enables the iwlmei kernel module.










































drivers/net/wireless/marvell/mwifiex/uap_cmd.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -389,7 +389,7 @@ mwifiex_set_wmm_params(struct mwifiex_private *priv,







{









	const u8 *vendor_ie;









	const u8 *wmm_ie;









	u8 wmm_oui[] = {0x00, 0x50, 0xf2, 0x02};









	static const u8 wmm_oui[] = {0x00, 0x50, 0xf2, 0x02};



















	vendor_ie = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,









					    WLAN_OUI_TYPE_MICROSOFT_WMM,