Commit af4acac7 authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge wireless into wireless-next 



There are some changes coming to wireless-next that will
otherwise cause conflicts, pull wireless in first to be
able to resolve that when applying the individual changes
rather than having to do merge resolution later.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 94dd7ce1 0647903e

MAINTAINERS

+4 −5
Original line number Diff line number Diff line
@@ -4169,14 +4169,14 @@ F: drivers/firmware/broadcom/tee_bnxt_fw.c 
F:	drivers/net/ethernet/broadcom/bnxt/

F:	include/linux/firmware/broadcom/tee_bnxt_fw.h









BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER









M:	Arend van Spriel <aspriel@gmail.com>









M:	Franky Lin <franky.lin@broadcom.com>









M:	Hante Meuleman <hante.meuleman@broadcom.com>









BROADCOM BRCM80211 IEEE802.11 WIRELESS DRIVERS









M:	Arend van Spriel <arend.vanspriel@broadcom.com>









L:	linux-wireless@vger.kernel.org









L:	brcm80211@lists.linux.dev









L:	brcm80211-dev-list.pdl@broadcom.com









S:	Supported









F:	drivers/net/wireless/broadcom/brcm80211/









F:	include/linux/platform_data/brcmfmac.h

















BROADCOM BRCMSTB GPIO DRIVER









M:	Doug Berger <opendmb@gmail.com>








@@ -11128,7 +11128,6 @@ S:	Supported







F:	drivers/net/wireless/intel/iwlegacy/

















INTEL WIRELESS WIFI LINK (iwlwifi)









M:	Gregory Greenman <gregory.greenman@intel.com>









M:	Miri Korenblit <miriam.rachel.korenblit@intel.com>









L:	linux-wireless@vger.kernel.org









S:	Supported
































drivers/net/wireless/ath/ar5523/ar5523.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -1803,5 +1803,6 @@ static struct usb_driver ar5523_driver = {

















module_usb_driver(ar5523_driver);



















MODULE_DESCRIPTION("Atheros AR5523 wireless driver");









MODULE_LICENSE("Dual BSD/GPL");









MODULE_FIRMWARE(AR5523_FIRMWARE_FILE);
























drivers/net/wireless/ath/wcn36xx/main.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -1685,6 +1685,7 @@ static struct platform_driver wcn36xx_driver = {

















module_platform_driver(wcn36xx_driver);



















MODULE_DESCRIPTION("Qualcomm Atheros WCN3660/3680 wireless driver");









MODULE_LICENSE("Dual BSD/GPL");









MODULE_AUTHOR("Eugene Krasnikov k.eugene.e@gmail.com");









MODULE_FIRMWARE(WLAN_NV_FILE);
























drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/module.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -20,6 +20,7 @@ static void __exit brcmf_bca_exit(void)







	brcmf_fwvid_unregister_vendor(BRCMF_FWVENDOR_BCA, THIS_MODULE);









}



















MODULE_DESCRIPTION("Broadcom FullMAC WLAN driver plugin for Broadcom AP chipsets");









MODULE_LICENSE("Dual BSD/GPL");









MODULE_IMPORT_NS(BRCMFMAC);










































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



+4
−2






























Original line number
Diff line number
Diff line







@@ -3765,8 +3765,10 @@ static int brcmf_internal_escan_add_info(struct cfg80211_scan_request *req,







		if (req->channels[i] == chan)









			break;









	}









	if (i == req->n_channels)









		req->channels[req->n_channels++] = chan;









	if (i == req->n_channels) {









		req->n_channels++;









		req->channels[i] = chan;









	}



















	for (i = 0; i < req->n_ssids; i++) {









		if (req->ssids[i].ssid_len == ssid_len &&