diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-tx.c | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c index 49dd03f9feda..b12c72d63ccb 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | |||
@@ -54,12 +54,6 @@ int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant) | |||
54 | } | 54 | } |
55 | } | 55 | } |
56 | 56 | ||
57 | /* Currently this is the superset of everything */ | ||
58 | static u16 iwlagn_get_hcmd_size(u8 cmd_id, u16 len) | ||
59 | { | ||
60 | return len; | ||
61 | } | ||
62 | |||
63 | static u16 iwlagn_build_addsta_hcmd(const struct iwl_addsta_cmd *cmd, u8 *data) | 57 | static u16 iwlagn_build_addsta_hcmd(const struct iwl_addsta_cmd *cmd, u8 *data) |
64 | { | 58 | { |
65 | u16 size = (u16)sizeof(struct iwl_addsta_cmd); | 59 | u16 size = (u16)sizeof(struct iwl_addsta_cmd); |
@@ -332,7 +326,6 @@ struct iwl_hcmd_ops iwlagn_bt_hcmd = { | |||
332 | }; | 326 | }; |
333 | 327 | ||
334 | struct iwl_hcmd_utils_ops iwlagn_hcmd_utils = { | 328 | struct iwl_hcmd_utils_ops iwlagn_hcmd_utils = { |
335 | .get_hcmd_size = iwlagn_get_hcmd_size, | ||
336 | .build_addsta_hcmd = iwlagn_build_addsta_hcmd, | 329 | .build_addsta_hcmd = iwlagn_build_addsta_hcmd, |
337 | .gain_computation = iwlagn_gain_computation, | 330 | .gain_computation = iwlagn_gain_computation, |
338 | .chain_noise_reset = iwlagn_chain_noise_reset, | 331 | .chain_noise_reset = iwlagn_chain_noise_reset, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index dec9820753f8..9d7e36d0fb2a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -99,7 +99,6 @@ struct iwl_hcmd_ops { | |||
99 | }; | 99 | }; |
100 | 100 | ||
101 | struct iwl_hcmd_utils_ops { | 101 | struct iwl_hcmd_utils_ops { |
102 | u16 (*get_hcmd_size)(u8 cmd_id, u16 len); | ||
103 | u16 (*build_addsta_hcmd)(const struct iwl_addsta_cmd *cmd, u8 *data); | 102 | u16 (*build_addsta_hcmd)(const struct iwl_addsta_cmd *cmd, u8 *data); |
104 | void (*gain_computation)(struct iwl_priv *priv, | 103 | void (*gain_computation)(struct iwl_priv *priv, |
105 | u32 *average_noise, | 104 | u32 *average_noise, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index 52b1b66f32d0..608d7a12c438 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c | |||
@@ -447,7 +447,6 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) | |||
447 | u16 fix_size; | 447 | u16 fix_size; |
448 | bool is_ct_kill = false; | 448 | bool is_ct_kill = false; |
449 | 449 | ||
450 | cmd->len = priv->cfg->ops->utils->get_hcmd_size(cmd->id, cmd->len); | ||
451 | fix_size = (u16)(cmd->len + sizeof(out_cmd->hdr)); | 450 | fix_size = (u16)(cmd->len + sizeof(out_cmd->hdr)); |
452 | 451 | ||
453 | /* | 452 | /* |