Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next (d17ec4d5) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/net/wireless/iwlwifi/Kconfig

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -87,6 +87,16 @@ config IWLWIFI_BCAST_FILTERING
	If unsure, don't enable this option, as some programs might		If unsure, don't enable this option, as some programs might
	expect incoming broadcasts for their normal operations.		expect incoming broadcasts for their normal operations.

			config IWLWIFI_UAPSD
			bool "enable U-APSD by default"
			depends on IWLMVM
			help
			Say Y here to enable U-APSD by default. This may cause
			interoperability problems with some APs, manifesting in lower than
			expected throughput due to those APs not enabling aggregation

			If unsure, say N.

	menu "Debugging Options"		menu "Debugging Options"

	config IWLWIFI_DEBUG		config IWLWIFI_DEBUG

drivers/net/wireless/iwlwifi/dvm/tx.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -580,7 +580,7 @@ int iwlagn_tx_agg_stop(struct iwl_priv priv, struct ieee80211_vif vif,
	* time, or we hadn't time to drain the AC queues.		* time, or we hadn't time to drain the AC queues.
	*/		*/
	if (agg_state == IWL_AGG_ON)		if (agg_state == IWL_AGG_ON)
	iwl_trans_txq_disable(priv->trans, txq_id);		iwl_trans_txq_disable(priv->trans, txq_id, true);
	else		else
	IWL_DEBUG_TX_QUEUES(priv, "Don't disable tx agg: %d\n",		IWL_DEBUG_TX_QUEUES(priv, "Don't disable tx agg: %d\n",
	agg_state);		agg_state);
	@@ -686,7 +686,7 @@ int iwlagn_tx_agg_flush(struct iwl_priv priv, struct ieee80211_vif vif,
	* time, or we hadn't time to drain the AC queues.		* time, or we hadn't time to drain the AC queues.
	*/		*/
	if (agg_state == IWL_AGG_ON)		if (agg_state == IWL_AGG_ON)
	iwl_trans_txq_disable(priv->trans, txq_id);		iwl_trans_txq_disable(priv->trans, txq_id, true);
	else		else
	IWL_DEBUG_TX_QUEUES(priv, "Don't disable tx agg: %d\n",		IWL_DEBUG_TX_QUEUES(priv, "Don't disable tx agg: %d\n",
	agg_state);		agg_state);
	@@ -781,7 +781,7 @@ static void iwlagn_check_ratid_empty(struct iwl_priv *priv, int sta_id, u8 tid)
	"Can continue DELBA flow ssn = next_recl = %d\n",		"Can continue DELBA flow ssn = next_recl = %d\n",
	tid_data->next_reclaimed);		tid_data->next_reclaimed);
	iwl_trans_txq_disable(priv->trans,		iwl_trans_txq_disable(priv->trans,
	tid_data->agg.txq_id);		tid_data->agg.txq_id, true);
	iwlagn_dealloc_agg_txq(priv, tid_data->agg.txq_id);		iwlagn_dealloc_agg_txq(priv, tid_data->agg.txq_id);
	tid_data->agg.state = IWL_AGG_OFF;		tid_data->agg.state = IWL_AGG_OFF;
	ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid);		ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid);

drivers/net/wireless/iwlwifi/iwl-7000.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6,6 +6,7 @@
	* GPL LICENSE SUMMARY		* GPL LICENSE SUMMARY
	*		*
	* Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.		* Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
			* Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of version 2 of the GNU General Public License as		* it under the terms of version 2 of the GNU General Public License as
	@@ -31,6 +32,7 @@
	* BSD LICENSE		* BSD LICENSE
	*		*
	* Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.		* Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
			* Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
	* All rights reserved.		* All rights reserved.
	*		*
	* Redistribution and use in source and binary forms, with or without		* Redistribution and use in source and binary forms, with or without

drivers/net/wireless/iwlwifi/iwl-8000.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6,6 +6,7 @@
	* GPL LICENSE SUMMARY		* GPL LICENSE SUMMARY
	*		*
	* Copyright(c) 2014 Intel Corporation. All rights reserved.		* Copyright(c) 2014 Intel Corporation. All rights reserved.
			* Copyright(c) 2014 Intel Mobile Communications GmbH
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of version 2 of the GNU General Public License as		* it under the terms of version 2 of the GNU General Public License as
	@@ -31,6 +32,7 @@
	* BSD LICENSE		* BSD LICENSE
	*		*
	* Copyright(c) 2014 Intel Corporation. All rights reserved.		* Copyright(c) 2014 Intel Corporation. All rights reserved.
			* Copyright(c) 2014 Intel Mobile Communications GmbH
	* All rights reserved.		* All rights reserved.
	*		*
	* Redistribution and use in source and binary forms, with or without		* Redistribution and use in source and binary forms, with or without

drivers/net/wireless/iwlwifi/iwl-csr.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6,6 +6,7 @@
	* GPL LICENSE SUMMARY		* GPL LICENSE SUMMARY
	*		*
	* Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.		* Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
			* Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of version 2 of the GNU General Public License as		* it under the terms of version 2 of the GNU General Public License as
	@@ -31,6 +32,7 @@
	* BSD LICENSE		* BSD LICENSE
	*		*
	* Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.		* Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
			* Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
	* All rights reserved.		* All rights reserved.
	*		*
	* Redistribution and use in source and binary forms, with or without		* Redistribution and use in source and binary forms, with or without