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

Merge tag 'wireless-2024-06-27' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless 

Johannes Berg says:

====================
Just a few changes:
 - maintainers: Larry Finger sadly passed away
 - maintainers: ath trees are in their group now
 - TXQ FQ quantum configuration fix
 - TI wl driver: work around stuck FW in AP mode
 - mac80211: disable softirqs in some new code
   needing that

* tag 'wireless-2024-06-27' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  MAINTAINERS: wifi: update ath.git location
  MAINTAINERS: Remembering Larry Finger
  wifi: mac80211: disable softirqs for queued frame handling
  wifi: cfg80211: restrict NL80211_ATTR_TXQ_QUANTUM values
  wifi: wlcore: fix wlcore AP mode
====================

Link: https://patch.msgid.link/20240627083627.15312-3-johannes@sipsolutions.net


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

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -1214,6 +1214,10 @@ D: UDF filesystem 
S: (ask for current address)

S: USA



N: Larry Finger

E: Larry.Finger@lwfinger.net

D: Maintainer of wireless drivers, too many to list here



N: Jürgen Fischer

E: fischer@norbit.de

D: Author of Adaptec AHA-152x SCSI driver

MAINTAINERS

+5 −8
Original line number Diff line number Diff line
@@ -3601,10 +3601,9 @@ W: https://wireless.wiki.kernel.org/en/users/Drivers/b43 
F:	drivers/net/wireless/broadcom/b43/









B43LEGACY WIRELESS DRIVER









M:	Larry Finger <Larry.Finger@lwfinger.net>









L:	linux-wireless@vger.kernel.org









L:	b43-dev@lists.infradead.org









S:	Maintained









S:	Orphan









W:	https://wireless.wiki.kernel.org/en/users/Drivers/b43









F:	drivers/net/wireless/broadcom/b43legacy/
















@@ -18374,7 +18373,7 @@ M:	Jeff Johnson <jjohnson@kernel.org>







L:	ath12k@lists.infradead.org









S:	Supported









W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath12k









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









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









F:	drivers/net/wireless/ath/ath12k/









N:	ath12k
















@@ -18384,7 +18383,7 @@ M:	Jeff Johnson <jjohnson@kernel.org>







L:	ath10k@lists.infradead.org









S:	Supported









W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath10k









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









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









F:	drivers/net/wireless/ath/ath10k/









N:	ath10k
















@@ -18395,7 +18394,7 @@ L:	ath11k@lists.infradead.org







S:	Supported









W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath11k









B:	https://wireless.wiki.kernel.org/en/users/Drivers/ath11k/bugreport









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









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









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









N:	ath11k
















@@ -18404,7 +18403,7 @@ M:	Toke Høiland-Jørgensen <toke@toke.dk>







L:	linux-wireless@vger.kernel.org









S:	Maintained









W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath9k









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









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









F:	Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml









F:	drivers/net/wireless/ath/ath9k/
















@@ -19509,7 +19508,6 @@ F:	drivers/net/wireless/realtek/rtl818x/rtl8180/















RTL8187 WIRELESS DRIVER









M:	Hin-Tak Leung <hintak.leung@gmail.com>









M:	Larry Finger <Larry.Finger@lwfinger.net>









L:	linux-wireless@vger.kernel.org









S:	Maintained









T:	git https://github.com/pkshih/rtw.git








@@ -21247,7 +21245,6 @@ W:	http://wiki.laptop.org/go/DCON







F:	drivers/staging/olpc_dcon/

















STAGING - REALTEK RTL8712U DRIVERS









M:	Larry Finger <Larry.Finger@lwfinger.net>









M:	Florian Schilhabel <florian.c.schilhabel@googlemail.com>.









S:	Odd Fixes









F:	drivers/staging/rtl8712/

























drivers/net/wireless/ti/wlcore/cmd.c



+0
−7






























Original line number
Diff line number
Diff line







@@ -1566,13 +1566,6 @@ int wl12xx_cmd_add_peer(struct wl1271 *wl, struct wl12xx_vif *wlvif,







		cpu_to_le32(wl1271_tx_enabled_rates_get(wl, sta_rates,









							wlvif->band));



















	if (!cmd->supported_rates) {









		wl1271_debug(DEBUG_CMD,









			     "peer has no supported rates yet, configuring basic rates: 0x%x",









			     wlvif->basic_rate_set);









		cmd->supported_rates = cpu_to_le32(wlvif->basic_rate_set);









	}



















	wl1271_debug(DEBUG_CMD, "new peer rates=0x%x queues=0x%x",









		     cmd->supported_rates, sta->uapsd_queues);










































drivers/net/wireless/ti/wlcore/main.c



+8
−9






























Original line number
Diff line number
Diff line







@@ -5139,19 +5139,23 @@ static int wl12xx_update_sta_state(struct wl1271 *wl,

















	/* Add station (AP mode) */









	if (is_ap &&









	    old_state == IEEE80211_STA_NOTEXIST &&









	    new_state == IEEE80211_STA_NONE) {









	    old_state == IEEE80211_STA_AUTH &&









	    new_state == IEEE80211_STA_ASSOC) {









		ret = wl12xx_sta_add(wl, wlvif, sta);









		if (ret)









			return ret;



















		wl_sta->fw_added = true;



















		wlcore_update_inconn_sta(wl, wlvif, wl_sta, true);









	}



















	/* Remove station (AP mode) */









	if (is_ap &&









	    old_state == IEEE80211_STA_NONE &&









	    new_state == IEEE80211_STA_NOTEXIST) {









	    old_state == IEEE80211_STA_ASSOC &&









	    new_state == IEEE80211_STA_AUTH) {









		wl_sta->fw_added = false;



















		/* must not fail */









		wl12xx_sta_remove(wl, wlvif, sta);


















@@ -5165,11 +5169,6 @@ static int wl12xx_update_sta_state(struct wl1271 *wl,







		if (ret < 0)









			return ret;



















		/* reconfigure rates */









		ret = wl12xx_cmd_add_peer(wl, wlvif, sta, wl_sta->hlid);









		if (ret < 0)









			return ret;



















		ret = wl1271_acx_set_ht_capabilities(wl, &sta->deflink.ht_cap,









						     true,









						     wl_sta->hlid);
































drivers/net/wireless/ti/wlcore/tx.c



+2
−5






























Original line number
Diff line number
Diff line







@@ -140,11 +140,8 @@ EXPORT_SYMBOL(wl12xx_is_dummy_packet);







static u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif,









				struct sk_buff *skb, struct ieee80211_sta *sta)









{









	if (sta) {









		struct wl1271_station *wl_sta;



















		wl_sta = (struct wl1271_station *)sta->drv_priv;









		return wl_sta->hlid;









	if (sta && wl1271_station(sta)->fw_added) {









		return wl1271_station(sta)->hlid;









	} else {









		struct ieee80211_hdr *hdr;