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

Commit a525d0ea authored by Luca Coelho's avatar Luca Coelho
Browse files

Merge tag 'iwlwifi-for-kalle-2016-05-04' of... 

Merge tag 'iwlwifi-for-kalle-2016-05-04' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes



* fix P2P rates (and possibly other issues)

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parents bae6692c 5c08b0f5

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

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
#define IWL8260_SMEM_OFFSET		0x400000

#define IWL8260_SMEM_LEN		0x68000



#define IWL8000_FW_PRE "iwlwifi-8000"

#define IWL8000_FW_PRE "iwlwifi-8000C-"

#define IWL8000_MODULE_FIRMWARE(api) \

	IWL8000_FW_PRE "-" __stringify(api) ".ucode"

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+0 −13
Original line number Diff line number Diff line
@@ -240,19 +240,6 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first) 
	snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode",

		 name_pre, tag);



	/*

	 * Starting 8000B - FW name format has changed. This overwrites the

	 * previous name and uses the new format.

	 */

	if (drv->trans->cfg->device_family == IWL_DEVICE_FAMILY_8000) {

		char rev_step = 'A' + CSR_HW_REV_STEP(drv->trans->hw_rev);



		if (rev_step != 'A')

			snprintf(drv->firmware_name,

				 sizeof(drv->firmware_name), "%s%c-%s.ucode",

				 name_pre, rev_step, tag);

	}



	IWL_DEBUG_INFO(drv, "attempting to load firmware %s'%s'\n",

		       (drv->fw_index == UCODE_EXPERIMENTAL_INDEX)

				? "EXPERIMENTAL " : "",

drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c

+4 −2
Original line number Diff line number Diff line
@@ -609,7 +609,8 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) 
	}



	/* Make room for fw's virtual image pages, if it exists */

	if (mvm->fw->img[mvm->cur_ucode].paging_mem_size)

	if (mvm->fw->img[mvm->cur_ucode].paging_mem_size &&

	    mvm->fw_paging_db[0].fw_paging_block)

		file_len += mvm->num_of_paging_blk *

			(sizeof(*dump_data) +

			 sizeof(struct iwl_fw_error_dump_paging) +
@@ -750,7 +751,8 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) 
	}



	/* Dump fw's virtual image */

	if (mvm->fw->img[mvm->cur_ucode].paging_mem_size) {

	if (mvm->fw->img[mvm->cur_ucode].paging_mem_size &&

	    mvm->fw_paging_db[0].fw_paging_block) {

		for (i = 1; i < mvm->num_of_paging_blk + 1; i++) {

			struct iwl_fw_error_dump_paging *paging;

			struct page *pages =

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

+2 −0
Original line number Diff line number Diff line
@@ -149,9 +149,11 @@ void iwl_free_fw_paging(struct iwl_mvm *mvm) 


		__free_pages(mvm->fw_paging_db[i].fw_paging_block,

			     get_order(mvm->fw_paging_db[i].fw_paging_size));

		mvm->fw_paging_db[i].fw_paging_block = NULL;

	}

	kfree(mvm->trans->paging_download_buf);

	mvm->trans->paging_download_buf = NULL;

	mvm->trans->paging_db = NULL;



	memset(mvm->fw_paging_db, 0, sizeof(mvm->fw_paging_db));

}

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

+2 −0
Original line number Diff line number Diff line
@@ -1149,6 +1149,8 @@ void __iwl_mvm_mac_stop(struct iwl_mvm *mvm) 
	/* the fw is stopped, the aux sta is dead: clean up driver state */

	iwl_mvm_del_aux_sta(mvm);



	iwl_free_fw_paging(mvm);



	/*

	 * Clear IN_HW_RESTART flag when stopping the hw (as restart_complete()

	 * won't be called in this case).