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

Commit e126b5d9 authored Jun 28, 2013 by Johannes Berg

iwlwifi: mvm: remove unneeded argument from iwl_mvm_tx_protection()



The LQ command argument isn't needed, it's always taken from the
station struct that's already passed, remove the argument.

Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

parent 2be01fa8

drivers/net/wireless/iwlwifi/mvm/rs.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -3193,13 +3193,14 @@ void iwl_mvm_rate_control_unregister(void)
		* iwl_mvm_tx_protection - Gets LQ command, change it to enable/disable
		* Tx protection, according to this rquest and previous requests,
		* and send the LQ command.
		* @lq: The LQ command
		* @mvmsta: The station
		* @enable: Enable Tx protection?
		*/
		int iwl_mvm_tx_protection(struct iwl_mvm mvm, struct iwl_lq_cmd lq,
		struct iwl_mvm_sta *mvmsta, bool enable)
		int iwl_mvm_tx_protection(struct iwl_mvm mvm, struct iwl_mvm_sta mvmsta,
		bool enable)
		{
		struct iwl_lq_cmd *lq = &mvmsta->lq_sta.lq;

		lockdep_assert_held(&mvm->mutex);

		if (enable) {

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -404,7 +404,7 @@ extern void iwl_mvm_rate_control_unregister(void);

		struct iwl_mvm_sta;

		int iwl_mvm_tx_protection(struct iwl_mvm mvm, struct iwl_lq_cmd lq,
		struct iwl_mvm_sta *mvmsta, bool enable);
		int iwl_mvm_tx_protection(struct iwl_mvm mvm, struct iwl_mvm_sta mvmsta,
		bool enable);

		#endif /* __rs__ */

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -807,8 +807,7 @@ int iwl_mvm_sta_tx_agg_oper(struct iwl_mvm mvm, struct ieee80211_vif vif,
		* method for HT traffic
		* this function also sends the LQ command
		*/
		return iwl_mvm_tx_protection(mvm, &mvmsta->lq_sta.lq,
		mvmsta, true);
		return iwl_mvm_tx_protection(mvm, mvmsta, true);
		/*
		* TODO: remove the TLC_RTS flag when we tear down the last
		* AGG session (agg_tids_count in DVM)

drivers/net/wireless/iwlwifi/mvm/tt.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -391,8 +391,7 @@ static void iwl_mvm_tt_tx_protection(struct iwl_mvm *mvm, bool enable)
		mvmsta = (void *)sta->drv_priv;
		if (enable == mvmsta->tt_tx_protection)
		continue;
		err = iwl_mvm_tx_protection(mvm, &mvmsta->lq_sta.lq,
		mvmsta, enable);
		err = iwl_mvm_tx_protection(mvm, mvmsta, enable);
		if (err) {
		IWL_ERR(mvm, "Failed to %s Tx protection\n",
		enable ? "enable" : "disable");