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

Commit 53f09e74 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

Merge branch 'fixes' into next 



Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parents b4f7a9d1 905e36ae

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -126,7 +126,7 @@ static int iwl_send_rss_cfg_cmd(struct iwl_mvm *mvm) 
	return iwl_mvm_send_cmd_pdu(mvm, RSS_CONFIG_CMD, 0, sizeof(cmd), &cmd);

	return iwl_mvm_send_cmd_pdu(mvm, RSS_CONFIG_CMD, 0, sizeof(cmd), &cmd);

}

}





static void iwl_free_fw_paging(struct iwl_mvm *mvm)

void iwl_free_fw_paging(struct iwl_mvm *mvm)

{

{

	int i;

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

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

	}

	}

	kfree(mvm->trans->paging_download_buf);

	kfree(mvm->trans->paging_download_buf);

	mvm->trans->paging_download_buf = NULL;



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

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

}

}

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -1318,6 +1318,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,

void iwl_mvm_rx_umac_scan_iter_complete_notif(struct iwl_mvm *mvm,

					      struct iwl_rx_cmd_buffer *rxb);

					      struct iwl_rx_cmd_buffer *rxb);





/* Paging */

void iwl_free_fw_paging(struct iwl_mvm *mvm);



/* MVM debugfs */

/* MVM debugfs */

#ifdef CONFIG_IWLWIFI_DEBUGFS

#ifdef CONFIG_IWLWIFI_DEBUGFS

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

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 Original line Diff line number Diff line
@@ -733,6 +733,8 @@ static void iwl_op_mode_mvm_stop(struct iwl_op_mode *op_mode) 
	for (i = 0; i < NVM_MAX_NUM_SECTIONS; i++)

	for (i = 0; i < NVM_MAX_NUM_SECTIONS; i++)

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

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





	iwl_free_fw_paging(mvm);



	iwl_mvm_tof_clean(mvm);

	iwl_mvm_tof_clean(mvm);





	ieee80211_free_hw(mvm->hw);

	ieee80211_free_hw(mvm->hw);

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

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

		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;

	return 0;

}

}