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

Commit 46975f78 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlagn: remove get_hcmd_size indirection 



There's no need for this, all commands are the right size.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 4613e72d

drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c

+0 −7
Original line number Diff line number Diff line
@@ -54,12 +54,6 @@ int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant) 
	}

}



/* Currently this is the superset of everything */

static u16 iwlagn_get_hcmd_size(u8 cmd_id, u16 len)

{

	return len;

}



static u16 iwlagn_build_addsta_hcmd(const struct iwl_addsta_cmd *cmd, u8 *data)

{

	u16 size = (u16)sizeof(struct iwl_addsta_cmd);
@@ -332,7 +326,6 @@ struct iwl_hcmd_ops iwlagn_bt_hcmd = { 
};



struct iwl_hcmd_utils_ops iwlagn_hcmd_utils = {

	.get_hcmd_size = iwlagn_get_hcmd_size,

	.build_addsta_hcmd = iwlagn_build_addsta_hcmd,

	.gain_computation = iwlagn_gain_computation,

	.chain_noise_reset = iwlagn_chain_noise_reset,

drivers/net/wireless/iwlwifi/iwl-core.h

+0 −1
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ struct iwl_hcmd_ops { 
};



struct iwl_hcmd_utils_ops {

	u16 (*get_hcmd_size)(u8 cmd_id, u16 len);

	u16 (*build_addsta_hcmd)(const struct iwl_addsta_cmd *cmd, u8 *data);

	void (*gain_computation)(struct iwl_priv *priv,

			u32 *average_noise,

drivers/net/wireless/iwlwifi/iwl-tx.c

+0 −1
Original line number Diff line number Diff line
@@ -447,7 +447,6 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) 
	u16 fix_size;

	bool is_ct_kill = false;



	cmd->len = priv->cfg->ops->utils->get_hcmd_size(cmd->id, cmd->len);

	fix_size = (u16)(cmd->len + sizeof(out_cmd->hdr));



	/*