Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'wireless-drivers-next-for-davem-2017-06-30' of... 

Merge tag 'wireless-drivers-next-for-davem-2017-06-30' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for 4.13

Mostly fixes and cleanups, but iwlwifi and rtlwifi had also some new
features.

Major changes:

iwlwifi

* some changes in suspend/resume handling to support new FWs

* Continued work towards the A000 family

* support for a new version of the TX flush FW API

* remove some noise from the kernel logs

rtlwifi

* more bluetooth coexistance improvements
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9cc9a5cb fdcbe65d

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -2785,8 +2785,11 @@ BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER 
M:	Arend van Spriel <arend.vanspriel@broadcom.com>

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

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

M:	Chi-Hsien Lin <chi-hsien.lin@cypress.com>

M:	Wright Feng <wright.feng@cypress.com>

L:	linux-wireless@vger.kernel.org

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

L:	brcm80211-dev-list@cypress.com

S:	Supported

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

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

+1 −1
Original line number Diff line number Diff line
@@ -1392,7 +1392,7 @@ static int ath10k_vdev_stop(struct ath10k_vif *arvif) 


	ret = ath10k_vdev_setup_sync(ar);

	if (ret) {

		ath10k_warn(ar, "failed to syncronise setup for vdev %i: %d\n",

		ath10k_warn(ar, "failed to synchronize setup for vdev %i: %d\n",

			    arvif->vdev_id, ret);

		return ret;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ static int ath10k_pci_wake_wait(struct ath10k *ar) 
	while (tot_delay < PCIE_WAKE_TIMEOUT) {

		if (ath10k_pci_is_awake(ar)) {

			if (tot_delay > PCIE_WAKE_LATE_US)

				ath10k_warn(ar, "device wakeup took %d ms which is unusally long, otherwise it works normally.\n",

				ath10k_warn(ar, "device wakeup took %d ms which is unusually long, otherwise it works normally.\n",

					    tot_delay / 1000);

			return 0;

		}

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

+2 −2
Original line number Diff line number Diff line
@@ -1553,7 +1553,7 @@ static int ath10k_sdio_hif_diag_read(struct ath10k *ar, u32 address, void *buf, 
	/* read the data */

	ret = ath10k_sdio_read(ar, MBOX_WINDOW_DATA_ADDRESS, buf, buf_len);

	if (ret) {

		ath10k_warn(ar, "failed to read from mbox window data addrress: %d\n",

		ath10k_warn(ar, "failed to read from mbox window data address: %d\n",

			    ret);

		return ret;

	}
@@ -1592,7 +1592,7 @@ static int ath10k_sdio_hif_diag_write_mem(struct ath10k *ar, u32 address, 
	ret = ath10k_sdio_write(ar, MBOX_WINDOW_DATA_ADDRESS, data, nbytes);

	if (ret) {

		ath10k_warn(ar,

			    "failed to write 0x%p to mbox window data addrress: %d\n",

			    "failed to write 0x%p to mbox window data address: %d\n",

			    data, ret);

		return ret;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ ath10k_thermal_set_cur_throttle_state(struct thermal_cooling_device *cdev, 
	return 0;

}



static struct thermal_cooling_device_ops ath10k_thermal_ops = {

static const struct thermal_cooling_device_ops ath10k_thermal_ops = {

	.get_max_state = ath10k_thermal_get_max_throttle_state,

	.get_cur_state = ath10k_thermal_get_cur_throttle_state,

	.set_cur_state = ath10k_thermal_set_cur_throttle_state,