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

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

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

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



Kalle Valo says:

====================
wireless-drivers fixes for 4.11

iwlwifi

* fix a user reported warning in DQA

mwifiex

* fix a potential double free
* fix lost early debug logs
* fix init wakeup warning message from device framework
* add Ganapathi and Xinming as maintainers

ath10k

* fix regression with QCA6174 during resume and firmware crash
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 557d054c 6be3b6cc

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -7846,6 +7846,8 @@ F: drivers/net/ethernet/marvell/mvneta.* 
MARVELL MWIFIEX WIRELESS DRIVER

M:	Amitkumar Karwar <akarwar@marvell.com>

M:	Nishant Sarmukadam <nishants@marvell.com>

M:	Ganapathi Bhat <gbhat@marvell.com>

M:	Xinming Hu <huxm@marvell.com>

L:	linux-wireless@vger.kernel.org

S:	Maintained

F:	drivers/net/wireless/marvell/mwifiex/

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ const struct ath10k_hw_regs qca6174_regs = { 
	.rtc_soc_base_address			= 0x00000800,

	.rtc_wmac_base_address			= 0x00001000,

	.soc_core_base_address			= 0x0003a000,

	.wlan_mac_base_address			= 0x00020000,

	.wlan_mac_base_address			= 0x00010000,

	.ce_wrapper_base_address		= 0x00034000,

	.ce0_base_address			= 0x00034400,

	.ce1_base_address			= 0x00034800,

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+3 −2
Original line number Diff line number Diff line
@@ -2319,7 +2319,7 @@ iwl_mvm_mac_release_buffered_frames(struct ieee80211_hw *hw, 
{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);



	/* Called when we need to transmit (a) frame(s) from agg queue */

	/* Called when we need to transmit (a) frame(s) from agg or dqa queue */



	iwl_mvm_sta_modify_sleep_tx_count(mvm, sta, reason, num_frames,

					  tids, more_data, true);
@@ -2338,7 +2338,8 @@ static void __iwl_mvm_mac_sta_notify(struct ieee80211_hw *hw, 
	for (tid = 0; tid < IWL_MAX_TID_COUNT; tid++) {

		struct iwl_mvm_tid_data *tid_data = &mvmsta->tid_data[tid];



		if (tid_data->state != IWL_AGG_ON &&

		if (!iwl_mvm_is_dqa_supported(mvm) &&

		    tid_data->state != IWL_AGG_ON &&

		    tid_data->state != IWL_EMPTYING_HW_QUEUE_DELBA)

			continue;

drivers/net/wireless/intel/iwlwifi/mvm/sta.c

+6 −5
Original line number Diff line number Diff line
@@ -3135,7 +3135,7 @@ void iwl_mvm_sta_modify_sleep_tx_count(struct iwl_mvm *mvm, 
				       struct ieee80211_sta *sta,

				       enum ieee80211_frame_release_type reason,

				       u16 cnt, u16 tids, bool more_data,

				       bool agg)

				       bool single_sta_queue)

{

	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);

	struct iwl_mvm_add_sta_cmd cmd = {
@@ -3155,14 +3155,14 @@ void iwl_mvm_sta_modify_sleep_tx_count(struct iwl_mvm *mvm, 
	for_each_set_bit(tid, &_tids, IWL_MAX_TID_COUNT)

		cmd.awake_acs |= BIT(tid_to_ucode_ac[tid]);



	/* If we're releasing frames from aggregation queues then check if the

	 * all queues combined that we're releasing frames from have

	/* If we're releasing frames from aggregation or dqa queues then check

	 * if all the queues that we're releasing frames from, combined, have:

	 *  - more frames than the service period, in which case more_data

	 *    needs to be set

	 *  - fewer than 'cnt' frames, in which case we need to adjust the

	 *    firmware command (but do that unconditionally)

	 */

	if (agg) {

	if (single_sta_queue) {

		int remaining = cnt;

		int sleep_tx_count;
@@ -3172,7 +3172,8 @@ void iwl_mvm_sta_modify_sleep_tx_count(struct iwl_mvm *mvm, 
			u16 n_queued;



			tid_data = &mvmsta->tid_data[tid];

			if (WARN(tid_data->state != IWL_AGG_ON &&

			if (WARN(!iwl_mvm_is_dqa_supported(mvm) &&

				 tid_data->state != IWL_AGG_ON &&

				 tid_data->state != IWL_EMPTYING_HW_QUEUE_DELBA,

				 "TID %d state is %d\n",

				 tid, tid_data->state)) {

drivers/net/wireless/intel/iwlwifi/mvm/sta.h

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ void iwl_mvm_sta_modify_sleep_tx_count(struct iwl_mvm *mvm, 
				       struct ieee80211_sta *sta,

				       enum ieee80211_frame_release_type reason,

				       u16 cnt, u16 tids, bool more_data,

				       bool agg);

				       bool single_sta_queue);

int iwl_mvm_drain_sta(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta,

		      bool drain);

void iwl_mvm_sta_modify_disable_tx(struct iwl_mvm *mvm,