Commit ce7928f7 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-next-2023-03-30' of... 

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

Johannes Berg says:

====================
Major stack changes:

 * TC offload support for drivers below mac80211
 * reduced neighbor report (RNR) handling for AP mode
 * mac80211 mesh fast-xmit and fast-rx support
 * support for another mesh A-MSDU format
   (seems nobody got the spec right)

Major driver changes:

Kalle moved the drivers that were just plain C files
in drivers/net/wireless/ to legacy/ and virtual/ dirs.

hwsim
 * multi-BSSID support
 * some FTM support

ath11k
 * MU-MIMO parameters support
 * ack signal support for management packets

rtl8xxxu
 * support for RTL8710BU aka RTL8188GU chips

rtw89
 * support for various newer firmware APIs

ath10k
 * enabled threaded NAPI on WCN3990

iwlwifi
 * lots of work for multi-link/EHT (wifi7)
 * hardware timestamping support for some devices/firwmares
 * TX beacon protection on newer hardware

* tag 'wireless-next-2023-03-30' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (181 commits)
  wifi: clean up erroneously introduced file
  wifi: iwlwifi: mvm: correctly use link in iwl_mvm_sta_del()
  wifi: iwlwifi: separate AP link management queues
  wifi: iwlwifi: mvm: free probe_resp_data later
  wifi: iwlwifi: bump FW API to 75 for AX devices
  wifi: iwlwifi: mvm: move max_agg_bufsize into host TLC lq_sta
  wifi: iwlwifi: mvm: send full STA during HW restart
  wifi: iwlwifi: mvm: rework active links counting
  wifi: iwlwifi: mvm: update mac config when assigning chanctx
  wifi: iwlwifi: mvm: use the correct link queue
  wifi: iwlwifi: mvm: clean up mac_id vs. link_id in MLD sta
  wifi: iwlwifi: mvm: fix station link data leak
  wifi: iwlwifi: mvm: initialize max_rc_amsdu_len per-link
  wifi: iwlwifi: mvm: use appropriate link for rate selection
  wifi: iwlwifi: mvm: use the new lockdep-checking macros
  wifi: iwlwifi: mvm: remove chanctx WARN_ON
  wifi: iwlwifi: mvm: avoid sending MAC context for idle
  wifi: iwlwifi: mvm: remove only link-specific AP keys
  wifi: iwlwifi: mvm: skip inactive links
  wifi: iwlwifi: mvm: adjust iwl_mvm_scan_respect_p2p_go_iter() for MLO
  ...
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents dee1efb3 aa2aa818

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -12276,7 +12276,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git

F:	Documentation/networking/mac80211-injection.rst

F:	Documentation/networking/mac80211_hwsim/mac80211_hwsim.rst

F:	drivers/net/wireless/mac80211_hwsim.[ch]

F:	drivers/net/wireless/virtual/mac80211_hwsim.[ch]

F:	include/net/mac80211.h

F:	net/mac80211/








@@ -17554,7 +17554,7 @@ F:	include/ras/ras_event.h







RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER









L:	linux-wireless@vger.kernel.org









S:	Orphan









F:	drivers/net/wireless/ray*









F:	drivers/net/wireless/legacy/ray*

















RC-CORE / LIRC FRAMEWORK









M:	Sean Young <sean@mess.org>








@@ -21798,7 +21798,7 @@ USB WIRELESS RNDIS DRIVER (rndis_wlan)







M:	Jussi Kivilinna <jussi.kivilinna@iki.fi>









L:	linux-wireless@vger.kernel.org









S:	Maintained









F:	drivers/net/wireless/rndis_wlan.c









F:	drivers/net/wireless/legacy/rndis_wlan.c

















USB XHCI DRIVER









M:	Mathias Nyman <mathias.nyman@intel.com>








@@ -22552,7 +22552,7 @@ F:	drivers/input/misc/wistron_btns.c







WL3501 WIRELESS PCMCIA CARD DRIVER









L:	linux-wireless@vger.kernel.org









S:	Odd fixes









F:	drivers/net/wireless/wl3501*









F:	drivers/net/wireless/legacy/wl3501*

















WOLFSON MICROELECTRONICS DRIVERS









L:	patches@opensource.cirrus.com

























drivers/net/wireless/Kconfig



+2
−73






























Original line number
Diff line number
Diff line







@@ -38,79 +38,8 @@ source "drivers/net/wireless/ti/Kconfig"







source "drivers/net/wireless/zydas/Kconfig"









source "drivers/net/wireless/quantenna/Kconfig"



















config PCMCIA_RAYCS









	tristate "Aviator/Raytheon 2.4GHz wireless support"









	depends on PCMCIA









	select WIRELESS_EXT









	select WEXT_SPY









	select WEXT_PRIV









	help









	  Say Y here if you intend to attach an Aviator/Raytheon PCMCIA









	  (PC-card) wireless Ethernet networking card to your computer.









	  Please read the file









	  <file:Documentation/networking/device_drivers/wifi/ray_cs.rst> for









	  details.



















	  To compile this driver as a module, choose M here: the module will be









	  called ray_cs.  If unsure, say N.



















config PCMCIA_WL3501









	tristate "Planet WL3501 PCMCIA cards"









	depends on CFG80211 && PCMCIA









	select WIRELESS_EXT









	select WEXT_SPY









	help









	  A driver for WL3501 PCMCIA 802.11 wireless cards made by Planet.









	  It has basic support for Linux wireless extensions and initial









	  micro support for ethtool.



















config MAC80211_HWSIM









	tristate "Simulated radio testing tool for mac80211"









	depends on MAC80211









	help









	  This driver is a developer testing tool that can be used to test









	  IEEE 802.11 networking stack (mac80211) functionality. This is not









	  needed for normal wireless LAN usage and is only for testing. See









	  Documentation/networking/mac80211_hwsim for more information on how









	  to use this tool.



















	  To compile this driver as a module, choose M here: the module will be









	  called mac80211_hwsim.  If unsure, say N.









source "drivers/net/wireless/legacy/Kconfig"



















config USB_NET_RNDIS_WLAN









	tristate "Wireless RNDIS USB support"









	depends on USB









	depends on CFG80211









	select USB_NET_DRIVERS









	select USB_USBNET









	select USB_NET_CDCETHER









	select USB_NET_RNDIS_HOST









	help









	  This is a driver for wireless RNDIS devices.









	  These are USB based adapters found in devices such as:



















	  Buffalo WLI-U2-KG125S









	  U.S. Robotics USR5421









	  Belkin F5D7051









	  Linksys WUSB54GSv2









	  Linksys WUSB54GSC









	  Asus WL169gE









	  Eminent EM4045









	  BT Voyager 1055









	  Linksys WUSB54GSv1









	  U.S. Robotics USR5420









	  BUFFALO WLI-USB-G54



















	  All of these devices are based on Broadcom 4320 chip which is the









	  only wireless RNDIS chip known to date.



















	  If you choose to build a module, it'll be called rndis_wlan.



















config VIRT_WIFI









	tristate "Wifi wrapper for ethernet drivers"









	depends on CFG80211









	help









	  This option adds support for ethernet connections to appear as if they









	  are wifi connections through a special rtnetlink device.









source "drivers/net/wireless/virtual/Kconfig"



















endif # WLAN
























drivers/net/wireless/Makefile



+2
−9






























Original line number
Diff line number
Diff line







@@ -23,12 +23,5 @@ obj-$(CONFIG_WLAN_VENDOR_ST) += st/







obj-$(CONFIG_WLAN_VENDOR_TI) += ti/









obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/



















# 16-bit wireless PCMCIA client drivers









obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o









obj-$(CONFIG_PCMCIA_WL3501)	+= wl3501_cs.o



















obj-$(CONFIG_USB_NET_RNDIS_WLAN)	+= rndis_wlan.o



















obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o



















obj-$(CONFIG_VIRT_WIFI)	+= virt_wifi.o








obj-$(CONFIG_WLAN) += legacy/









obj-$(CONFIG_WLAN) += virtual/
























drivers/net/wireless/ath/ath.h



+7
−5






























Original line number
Diff line number
Diff line







@@ -96,11 +96,13 @@ struct ath_keyval {







	u8 kv_type;









	u8 kv_pad;









	u16 kv_len;









	struct_group(kv_values,









		u8 kv_val[16]; /* TK */









		u8 kv_mic[8]; /* Michael MIC key */









		u8 kv_txmic[8]; /* Michael MIC TX key (used only if the hardware









				 * supports both MIC keys in the same key cache entry;









				 * in that case, kv_mic is the RX key) */









	);









};



















enum ath_cipher {
































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



+0
−52






























Original line number
Diff line number
Diff line







@@ -77,45 +77,6 @@ static inline u32 shadow_sr_wr_ind_addr(struct ath10k *ar,







	return addr;









}



















static inline u32 shadow_dst_wr_ind_addr(struct ath10k *ar,









					 struct ath10k_ce_pipe *ce_state)









{









	u32 ce_id = ce_state->id;









	u32 addr = 0;



















	switch (ce_id) {









	case 1:









		addr = 0x00032034;









		break;









	case 2:









		addr = 0x00032038;









		break;









	case 5:









		addr = 0x00032044;









		break;









	case 7:









		addr = 0x0003204C;









		break;









	case 8:









		addr = 0x00032050;









		break;









	case 9:









		addr = 0x00032054;









		break;









	case 10:









		addr = 0x00032058;









		break;









	case 11:









		addr = 0x0003205C;









		break;









	default:









		ath10k_warn(ar, "invalid CE id: %d", ce_id);









		break;









	}



















	return addr;









}



















static inline unsigned int









ath10k_set_ring_byte(unsigned int offset,









		     struct ath10k_hw_ce_regs_addr_map *addr_map)








@@ -438,19 +399,6 @@ static inline void ath10k_ce_watermark_intr_disable(struct ath10k *ar,







			  host_ie_addr & ~(wm_regs->wm_mask));









}



















static inline void ath10k_ce_error_intr_enable(struct ath10k *ar,









					       u32 ce_ctrl_addr)









{









	struct ath10k_hw_ce_misc_regs *misc_regs = ar->hw_ce_regs->misc_regs;



















	u32 misc_ie_addr = ath10k_ce_read32(ar, ce_ctrl_addr +









					    ar->hw_ce_regs->misc_ie_addr);



















	ath10k_ce_write32(ar,









			  ce_ctrl_addr + ar->hw_ce_regs->misc_ie_addr,









			  misc_ie_addr | misc_regs->err_mask);









}



















static inline void ath10k_ce_error_intr_disable(struct ath10k *ar,









						u32 ce_ctrl_addr)









{