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

Commit fdcbe65d authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git 

ath.git patches for 4.13. Major changes:

Only bugfixes or cleanups, no new features.
parents 3334c28e 6788a383

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

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




	ret = ath10k_vdev_setup_sync(ar);

	ret = ath10k_vdev_setup_sync(ar);

	if (ret) {

	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);

			    arvif->vdev_id, ret);

		return ret;

		return ret;

	}

	}

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

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

	while (tot_delay < PCIE_WAKE_TIMEOUT) {

		if (ath10k_pci_is_awake(ar)) {

		if (ath10k_pci_is_awake(ar)) {

			if (tot_delay > PCIE_WAKE_LATE_US)

			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);

					    tot_delay / 1000);

			return 0;

			return 0;

		}

		}

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

+2 −2
Original line number Original line 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 */

	/* read the data */

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

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

	if (ret) {

	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);

			    ret);

		return 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);

	ret = ath10k_sdio_write(ar, MBOX_WINDOW_DATA_ADDRESS, data, nbytes);

	if (ret) {

	if (ret) {

		ath10k_warn(ar,

		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);

			    data, ret);

		return ret;

		return ret;

	}

	}

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

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

	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_max_state = ath10k_thermal_get_max_throttle_state,

	.get_cur_state = ath10k_thermal_get_cur_throttle_state,

	.get_cur_state = ath10k_thermal_get_cur_throttle_state,

	.set_cur_state = ath10k_thermal_set_cur_throttle_state,

	.set_cur_state = ath10k_thermal_set_cur_throttle_state,

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -2022,7 +2022,7 @@ ath10k_wmi_tlv_op_gen_sta_keepalive(struct ath10k *ar, 
	arp->dest_ip4_addr = arg->dest_ip4_addr;

	arp->dest_ip4_addr = arg->dest_ip4_addr;

	ether_addr_copy(arp->dest_mac_addr.addr, arg->dest_mac_addr);

	ether_addr_copy(arp->dest_mac_addr.addr, arg->dest_mac_addr);





	ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv sta keepalive vdev %d enabled %d method %d inverval %d\n",

	ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv sta keepalive vdev %d enabled %d method %d interval %d\n",

		   arg->vdev_id, arg->enabled, arg->method, arg->interval);

		   arg->vdev_id, arg->enabled, arg->method, arg->interval);

	return skb;

	return skb;

}

}