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

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

Merge tag 'wireless-drivers-for-davem-2016-03-04' of... 

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



Kalle Valo says:

====================
wireless-drivers fixes for 4.5

iwlwifi

* free firmware paging memory when the module is unloaded or device removed
* fix pending frames counter to fix an issue when removing stations

ssb

* fix a build problem related to ssb_fill_sprom_with_fallback()
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 979d804e 10da848f

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

+3 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static int iwl_send_tx_ant_cfg(struct iwl_mvm *mvm, u8 valid_tx_ant) 
				    sizeof(tx_ant_cmd), &tx_ant_cmd);

}



static void iwl_free_fw_paging(struct iwl_mvm *mvm)

void iwl_free_fw_paging(struct iwl_mvm *mvm)

{

	int i;
@@ -127,6 +127,8 @@ static void iwl_free_fw_paging(struct iwl_mvm *mvm) 
			     get_order(mvm->fw_paging_db[i].fw_paging_size));

	}

	kfree(mvm->trans->paging_download_buf);

	mvm->trans->paging_download_buf = NULL;



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

}

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

+3 −0
Original line number Diff line number Diff line
@@ -1225,6 +1225,9 @@ void iwl_mvm_rx_umac_scan_complete_notif(struct iwl_mvm *mvm, 
void iwl_mvm_rx_umac_scan_iter_complete_notif(struct iwl_mvm *mvm,

					      struct iwl_rx_cmd_buffer *rxb);



/* Paging */

void iwl_free_fw_paging(struct iwl_mvm *mvm);



/* MVM debugfs */

#ifdef CONFIG_IWLWIFI_DEBUGFS

int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir);

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

+2 −0
Original line number Diff line number Diff line
@@ -684,6 +684,8 @@ static void iwl_op_mode_mvm_stop(struct iwl_op_mode *op_mode) 
	for (i = 0; i < NVM_MAX_NUM_SECTIONS; i++)

		kfree(mvm->nvm_sections[i].data);



	iwl_free_fw_paging(mvm);



	iwl_mvm_tof_clean(mvm);



	ieee80211_free_hw(mvm->hw);

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

+9 −0
Original line number Diff line number Diff line
@@ -423,6 +423,15 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb) 
		return -1;

	}



	/*

	 * Increase the pending frames counter, so that later when a reply comes

	 * in and the counter is decreased - we don't start getting negative

	 * values.

	 * Note that we don't need to make sure it isn't agg'd, since we're

	 * TXing non-sta

	 */

	atomic_inc(&mvm->pending_frames[sta_id]);



	return 0;

}

drivers/ssb/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ config SSB_SDIOHOST 
config SSB_HOST_SOC

	bool "Support for SSB bus on SoC"

	depends on SSB && BCM47XX_NVRAM

	select SSB_SPROM

	help

	  Host interface for a SSB directly mapped into memory. This is

	  for some Broadcom SoCs from the BCM47xx and BCM53xx lines.