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

Commit a0c38b21 authored by Eyal Shapira's avatar Eyal Shapira Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: rs: move rs_program_fix_rate to cleanup ifdefs 



Move rs_program_fix_rate right before it's caller where we're
already in the context of an ifdef CPTCFG_MAC80211_DEBUGFS so
we can get rid of the extra ifdefs surrounding the original
location.

Signed-off-by: default avatarEyal Shapira <eyal@wizery.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 3fc07953

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

+22 −24
Original line number Diff line number Diff line
@@ -504,30 +504,6 @@ static inline u8 rs_is_valid_ant(u8 valid_antenna, u8 ant_type) 
	return (ant_type & valid_antenna) == ant_type;

}



#ifdef CONFIG_MAC80211_DEBUGFS

/**

 * Program the device to use fixed rate for frame transmit

 * This is for debugging/testing only

 * once the device start use fixed rate, we need to reload the module

 * to being back the normal operation.

 */

static void rs_program_fix_rate(struct iwl_mvm *mvm,

				struct iwl_lq_sta *lq_sta)

{

	lq_sta->active_legacy_rate = 0x0FFF;	/* 1 - 54 MBits, includes CCK */

	lq_sta->active_siso_rate   = 0x1FD0;	/* 6 - 60 MBits, no 9, no CCK */

	lq_sta->active_mimo2_rate  = 0x1FD0;	/* 6 - 60 MBits, no 9, no CCK */



	IWL_DEBUG_RATE(mvm, "sta_id %d rate 0x%X\n",

		       lq_sta->lq.sta_id, lq_sta->dbg_fixed_rate);



	if (lq_sta->dbg_fixed_rate) {

		rs_fill_link_cmd(NULL, NULL, lq_sta, lq_sta->dbg_fixed_rate);

		iwl_mvm_send_lq_cmd(lq_sta->drv, &lq_sta->lq, false);

	}

}

#endif



static int rs_tl_turn_on_agg_for_tid(struct iwl_mvm *mvm,

				      struct iwl_lq_sta *lq_data, u8 tid,

				      struct ieee80211_sta *sta)
@@ -2612,6 +2588,28 @@ static int rs_pretty_print_rate(char *buf, const u32 rate) 
		       (rate & RATE_MCS_ZLF_MSK) ? "ZLF " : "");

}



/**

 * Program the device to use fixed rate for frame transmit

 * This is for debugging/testing only

 * once the device start use fixed rate, we need to reload the module

 * to being back the normal operation.

 */

static void rs_program_fix_rate(struct iwl_mvm *mvm,

				struct iwl_lq_sta *lq_sta)

{

	lq_sta->active_legacy_rate = 0x0FFF;	/* 1 - 54 MBits, includes CCK */

	lq_sta->active_siso_rate   = 0x1FD0;	/* 6 - 60 MBits, no 9, no CCK */

	lq_sta->active_mimo2_rate  = 0x1FD0;	/* 6 - 60 MBits, no 9, no CCK */



	IWL_DEBUG_RATE(mvm, "sta_id %d rate 0x%X\n",

		       lq_sta->lq.sta_id, lq_sta->dbg_fixed_rate);



	if (lq_sta->dbg_fixed_rate) {

		rs_fill_link_cmd(NULL, NULL, lq_sta, lq_sta->dbg_fixed_rate);

		iwl_mvm_send_lq_cmd(lq_sta->drv, &lq_sta->lq, false);

	}

}



static ssize_t rs_sta_dbgfs_scale_table_write(struct file *file,

			const char __user *user_buf, size_t count, loff_t *ppos)

{