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

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

Merge tag 'wireless-drivers-next-for-davem-2017-11-03' of... 

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



Kalle Valo says:

====================
wireless-drivers-next patches for 4.15

Mostly fixes this time, but also few new features.

Major changes:

wil6210

* remove ssid debugfs file

rsi

* add WOWLAN support for suspend, hibernate and shutdown states

ath10k

* add support for CCMP-256, GCMP and GCMP-256 ciphers on hardware
  where it's supported (QCA99x0 and QCA4019)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2a171788 e226fb5a

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -14569,7 +14569,6 @@ L: wil6210@qca.qualcomm.com 
S:	Supported

W:	http://wireless.kernel.org/en/users/Drivers/wil6210

F:	drivers/net/wireless/ath/wil6210/

F:	include/uapi/linux/wil6210_uapi.h



WIMAX STACK

M:	Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>

drivers/bcma/driver_mips.c

+7 −4
Original line number Diff line number Diff line
@@ -184,11 +184,14 @@ static void bcma_core_mips_print_irq(struct bcma_device *dev, unsigned int irq) 
{

	int i;

	static const char *irq_name[] = {"2(S)", "3", "4", "5", "6", "D", "I"};

	char interrupts[20];

	char *ints = interrupts;



	bcma_debug(dev->bus, "core 0x%04x, irq :", dev->id.id);

	for (i = 0; i <= 6; i++)

		pr_cont(" %s%s", irq_name[i], i == irq ? "*" : " ");

	pr_cont("\n");

	for (i = 0; i < ARRAY_SIZE(irq_name); i++)

		ints += sprintf(ints, " %s%c",

				irq_name[i], i == irq ? '*' : ' ');



	bcma_debug(dev->bus, "core 0x%04x, irq:%s\n", dev->id.id, interrupts);

}



static void bcma_core_mips_dump_irq(struct bcma_bus *bus)

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

+3 −4
Original line number Diff line number Diff line
@@ -889,9 +889,9 @@ static void ar5523_tx_work(struct work_struct *work) 
	mutex_unlock(&ar->mutex);

}



static void ar5523_tx_wd_timer(unsigned long arg)

static void ar5523_tx_wd_timer(struct timer_list *t)

{

	struct ar5523 *ar = (struct ar5523 *) arg;

	struct ar5523 *ar = from_timer(ar, t, tx_wd_timer);



	ar5523_dbg(ar, "TX watchdog timer triggered\n");

	ieee80211_queue_work(ar->hw, &ar->tx_wd_work);
@@ -1599,8 +1599,7 @@ static int ar5523_probe(struct usb_interface *intf, 
	mutex_init(&ar->mutex);



	INIT_DELAYED_WORK(&ar->stat_work, ar5523_stat_work);

	init_timer(&ar->tx_wd_timer);

	setup_timer(&ar->tx_wd_timer, ar5523_tx_wd_timer, (unsigned long) ar);

	timer_setup(&ar->tx_wd_timer, ar5523_tx_wd_timer, 0);

	INIT_WORK(&ar->tx_wd_work, ar5523_tx_wd_work);

	INIT_WORK(&ar->tx_work, ar5523_tx_work);

	INIT_LIST_HEAD(&ar->tx_queue_pending);

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

+13 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.spectral_bin_discard = 0,

		.vht160_mcs_rx_highest = 0,

		.vht160_mcs_tx_highest = 0,

		.n_cipher_suites = 8,

	},

	{

		.id = QCA9887_HW_1_0_VERSION,
@@ -97,6 +98,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.spectral_bin_discard = 0,

		.vht160_mcs_rx_highest = 0,

		.vht160_mcs_tx_highest = 0,

		.n_cipher_suites = 8,

	},

	{

		.id = QCA6174_HW_2_1_VERSION,
@@ -119,6 +121,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.spectral_bin_discard = 0,

		.vht160_mcs_rx_highest = 0,

		.vht160_mcs_tx_highest = 0,

		.n_cipher_suites = 8,

	},

	{

		.id = QCA6174_HW_2_1_VERSION,
@@ -141,6 +144,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.spectral_bin_discard = 0,

		.vht160_mcs_rx_highest = 0,

		.vht160_mcs_tx_highest = 0,

		.n_cipher_suites = 8,

	},

	{

		.id = QCA6174_HW_3_0_VERSION,
@@ -163,6 +167,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.spectral_bin_discard = 0,

		.vht160_mcs_rx_highest = 0,

		.vht160_mcs_tx_highest = 0,

		.n_cipher_suites = 8,

	},

	{

		.id = QCA6174_HW_3_2_VERSION,
@@ -188,6 +193,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.spectral_bin_discard = 0,

		.vht160_mcs_rx_highest = 0,

		.vht160_mcs_tx_highest = 0,

		.n_cipher_suites = 8,

	},

	{

		.id = QCA99X0_HW_2_0_DEV_VERSION,
@@ -216,6 +222,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.spectral_bin_discard = 4,

		.vht160_mcs_rx_highest = 0,

		.vht160_mcs_tx_highest = 0,

		.n_cipher_suites = 11,

	},

	{

		.id = QCA9984_HW_1_0_DEV_VERSION,
@@ -249,6 +256,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		 */

		.vht160_mcs_rx_highest = 1560,

		.vht160_mcs_tx_highest = 1560,

		.n_cipher_suites = 11,

	},

	{

		.id = QCA9888_HW_2_0_DEV_VERSION,
@@ -281,6 +289,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		 */

		.vht160_mcs_rx_highest = 780,

		.vht160_mcs_tx_highest = 780,

		.n_cipher_suites = 11,

	},

	{

		.id = QCA9377_HW_1_0_DEV_VERSION,
@@ -303,6 +312,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.spectral_bin_discard = 0,

		.vht160_mcs_rx_highest = 0,

		.vht160_mcs_tx_highest = 0,

		.n_cipher_suites = 8,

	},

	{

		.id = QCA9377_HW_1_1_DEV_VERSION,
@@ -327,6 +337,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.spectral_bin_discard = 0,

		.vht160_mcs_rx_highest = 0,

		.vht160_mcs_tx_highest = 0,

		.n_cipher_suites = 8,

	},

	{

		.id = QCA4019_HW_1_0_DEV_VERSION,
@@ -356,6 +367,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.spectral_bin_discard = 4,

		.vht160_mcs_rx_highest = 0,

		.vht160_mcs_tx_highest = 0,

		.n_cipher_suites = 11,

	},

};
@@ -377,6 +389,7 @@ static const char *const ath10k_core_fw_feature_str[] = { 
	[ATH10K_FW_FEATURE_BTCOEX_PARAM] = "btcoex-param",

	[ATH10K_FW_FEATURE_SKIP_NULL_FUNC_WAR] = "skip-null-func-war",

	[ATH10K_FW_FEATURE_ALLOWS_MESH_BCAST] = "allows-mesh-bcast",

	[ATH10K_FW_FEATURE_NO_PS] = "no-ps",

};



static unsigned int ath10k_core_get_fw_feature_str(char *buf,

drivers/net/wireless/ath/ath10k/core.h

+3 −0
Original line number Diff line number Diff line
@@ -612,6 +612,9 @@ enum ath10k_fw_features { 
	 */

	ATH10K_FW_FEATURE_ALLOWS_MESH_BCAST = 16,



	/* Firmware does not support power save in station mode. */

	ATH10K_FW_FEATURE_NO_PS = 17,



	/* keep last */

	ATH10K_FW_FEATURE_COUNT,

};