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

Merge tag 'wireless-drivers-next-2021-10-07' of... 

Merge tag 'wireless-drivers-next-2021-10-07' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for v5.16

First set of patches for v5.16. ath11k getting most of new features
this time. Other drivers also have few new features, and of course the
usual set of fixes and cleanups all over.

Major changes:

rtw88

* support adaptivity for ETSI/JP DFS region

* 8821c: support RFE type4 wifi NIC

brcmfmac

* DMI nvram filename quirk for Cyberbook T116 tablet

ath9k

* load calibration data and pci init values via nvmem subsystem

ath11k

* include channel rx and tx time in survey dump statistics

* support for setting fixed Wi-Fi 6 rates from user space

* support for 80P80 and 160 MHz bandwidths

* spectral scan support for QCN9074

* support for calibration data files per radio

* support for calibration data via eeprom

* support for rx decapsulation offload (data frames in 802.3 format)

* support channel 2 in 6 GHz band

ath10k

* include frame time stamp in beacon and probe response frames

wcn36xx

* enable Idle Mode Power Save (IMPS) to reduce power consumption during idle
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5a98dcf5 b3fcf9c5

drivers/bcma/main.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ MODULE_DESCRIPTION("Broadcom's specific AMBA driver"); 
MODULE_LICENSE("GPL");



/* contains the number the next bus should get. */

static unsigned int bcma_bus_next_num = 0;

static unsigned int bcma_bus_next_num;



/* bcma_buses_mutex locks the bcma_bus_next_num */

static DEFINE_MUTEX(bcma_buses_mutex);

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

+1 −2
Original line number Diff line number Diff line
@@ -1772,9 +1772,8 @@ static const struct usb_device_id ar5523_id_table[] = { 
	AR5523_DEVICE_UG(0x0846, 0x5f00),	/* Netgear / WPN111 */

	AR5523_DEVICE_UG(0x083a, 0x4506),	/* SMC / EZ Connect

						   SMCWUSBT-G2 */

	AR5523_DEVICE_UG(0x157e, 0x3006),	/* Umedia / AR5523_1 */

	AR5523_DEVICE_UG(0x157e, 0x3006),	/* Umedia / AR5523_1, TEW444UBEU*/

	AR5523_DEVICE_UX(0x157e, 0x3205),	/* Umedia / AR5523_2 */

	AR5523_DEVICE_UG(0x157e, 0x3006),	/* Umedia / TEW444UBEU */

	AR5523_DEVICE_UG(0x1435, 0x0826),	/* Wistronneweb / AR5523_1 */

	AR5523_DEVICE_UX(0x1435, 0x0828),	/* Wistronneweb / AR5523_2 */

	AR5523_DEVICE_UG(0x0cde, 0x0012),	/* Zcom / AR5523 */

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

+23 −8
Original line number Diff line number Diff line
@@ -993,8 +993,12 @@ static void ath10k_mac_vif_beacon_cleanup(struct ath10k_vif *arvif) 
	ath10k_mac_vif_beacon_free(arvif);



	if (arvif->beacon_buf) {

		if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)

			kfree(arvif->beacon_buf);

		else

			dma_free_coherent(ar->dev, IEEE80211_MAX_FRAME_LEN,

				  arvif->beacon_buf, arvif->beacon_paddr);

					  arvif->beacon_buf,

					  arvif->beacon_paddr);

		arvif->beacon_buf = NULL;

	}

}
@@ -5576,10 +5580,17 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, 
	if (vif->type == NL80211_IFTYPE_ADHOC ||

	    vif->type == NL80211_IFTYPE_MESH_POINT ||

	    vif->type == NL80211_IFTYPE_AP) {

		arvif->beacon_buf = dma_alloc_coherent(ar->dev,

		if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL) {

			arvif->beacon_buf = kmalloc(IEEE80211_MAX_FRAME_LEN,

						    GFP_KERNEL);

			arvif->beacon_paddr = (dma_addr_t)arvif->beacon_buf;

		} else {

			arvif->beacon_buf =

				dma_alloc_coherent(ar->dev,

						   IEEE80211_MAX_FRAME_LEN,

						   &arvif->beacon_paddr,

						   GFP_ATOMIC);

		}

		if (!arvif->beacon_buf) {

			ret = -ENOMEM;

			ath10k_warn(ar, "failed to allocate beacon buffer: %d\n",
@@ -5794,8 +5805,12 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, 


err:

	if (arvif->beacon_buf) {

		if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)

			kfree(arvif->beacon_buf);

		else

			dma_free_coherent(ar->dev, IEEE80211_MAX_FRAME_LEN,

				  arvif->beacon_buf, arvif->beacon_paddr);

					  arvif->beacon_buf,

					  arvif->beacon_paddr);

		arvif->beacon_buf = NULL;

	}

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

+4 −1
Original line number Diff line number Diff line
@@ -1363,8 +1363,11 @@ static void ath10k_rx_indication_async_work(struct work_struct *work) 
		ep->ep_ops.ep_rx_complete(ar, skb);

	}



	if (test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags))

	if (test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags)) {

		local_bh_disable();

		napi_schedule(&ar->napi);

		local_bh_enable();

	}

}



static int ath10k_sdio_read_rtc_state(struct ath10k_sdio *ar_sdio, unsigned char *state)

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

+4 −0
Original line number Diff line number Diff line
@@ -2610,6 +2610,10 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb) 
	if (ieee80211_is_beacon(hdr->frame_control))

		ath10k_mac_handle_beacon(ar, skb);



	if (ieee80211_is_beacon(hdr->frame_control) ||

	    ieee80211_is_probe_resp(hdr->frame_control))

		status->boottime_ns = ktime_get_boottime_ns();



	ath10k_dbg(ar, ATH10K_DBG_MGMT,

		   "event mgmt rx skb %pK len %d ftype %02x stype %02x\n",

		   skb, skb->len,