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

Commit 8bbda283 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-for-kalle-2018-02-16-2' of... 

Merge tag 'iwlwifi-for-kalle-2018-02-16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

First batch of iwlwifi fixes intended for 4.16:

* A couple of bugzilla fixes
  - Fix a bogus warning when freeing a TFD;
  - Fix severe throughput problem with 9000 series;
* Fix for a bug that caused queue hangs in certain situations;
* Fix for an issue with IBSS;
* Fix an issue with rate-scalingin AP-mode.
parents 7ac8ff95 6b7a5aea

drivers/net/wireless/intel/iwlwifi/fw/init.c

+0 −6
Original line number Diff line number Diff line
@@ -76,9 +76,3 @@ void iwl_fw_runtime_init(struct iwl_fw_runtime *fwrt, struct iwl_trans *trans, 
	iwl_fwrt_dbgfs_register(fwrt, dbgfs_dir);

}

IWL_EXPORT_SYMBOL(iwl_fw_runtime_init);
 


void iwl_fw_runtime_exit(struct iwl_fw_runtime *fwrt)

{

	iwl_fw_cancel_timestamp(fwrt);

}

IWL_EXPORT_SYMBOL(iwl_fw_runtime_exit);

drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c

+2 −1
Original line number Diff line number Diff line
@@ -438,7 +438,8 @@ int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
	}



	/* Allocate the CAB queue for softAP and GO interfaces */

	if (vif->type == NL80211_IFTYPE_AP) {

	if (vif->type == NL80211_IFTYPE_AP ||

	    vif->type == NL80211_IFTYPE_ADHOC) {

		/*

		 * For TVQM this will be overwritten later with the FW assigned

		 * queue value (when queue is enabled).

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

+4 −0
Original line number Diff line number Diff line
@@ -2682,6 +2682,10 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw, 


		/* enable beacon filtering */

		WARN_ON(iwl_mvm_enable_beacon_filter(mvm, vif, 0));



		iwl_mvm_rs_rate_init(mvm, sta, mvmvif->phy_ctxt->channel->band,

				     false);



		ret = 0;

	} else if (old_state == IEEE80211_STA_AUTHORIZED &&

		   new_state == IEEE80211_STA_ASSOC) {

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

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
#include "fw/runtime.h"

#include "fw/dbg.h"

#include "fw/acpi.h"

#include "fw/debugfs.h"



#define IWL_MVM_MAX_ADDRESSES		5

/* RSSI offset for WkP */
@@ -1783,6 +1784,7 @@ static inline u32 iwl_mvm_flushable_queues(struct iwl_mvm *mvm) 


static inline void iwl_mvm_stop_device(struct iwl_mvm *mvm)

{

	iwl_fw_cancel_timestamp(&mvm->fwrt);

	iwl_free_fw_paging(&mvm->fwrt);

	clear_bit(IWL_MVM_STATUS_FIRMWARE_RUNNING, &mvm->status);

	iwl_fw_dump_conf_clear(&mvm->fwrt);

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

+0 −2
Original line number Diff line number Diff line
@@ -802,7 +802,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, 
	iwl_mvm_leds_exit(mvm);

	iwl_mvm_thermal_exit(mvm);

 out_free:

	iwl_fw_runtime_exit(&mvm->fwrt);

	iwl_fw_flush_dump(&mvm->fwrt);



	if (iwlmvm_mod_params.init_dbg)
@@ -843,7 +842,6 @@ static void iwl_op_mode_mvm_stop(struct iwl_op_mode *op_mode) 
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_IWLWIFI_DEBUGFS)

	kfree(mvm->d3_resume_sram);

#endif

	iwl_fw_runtime_exit(&mvm->fwrt);

	iwl_trans_op_mode_leave(mvm->trans);



	iwl_phy_db_free(mvm->phy_db);