Skip to content

Commit 0a8159c

Browse files
gomordlucacoelho
authored andcommitted
iwlwifi: remove wide_cmd_header field
Driver doesn't support fw without wide_cmd so driver always sets it to true. instead of setting it always to true just remove the field. Signed-off-by: Mordechay Goodstein <[email protected]> Signed-off-by: Luca Coelho <[email protected]> Link: https://lore.kernel.org/r/iwlwifi.20200928121852.e6137861d917.I93405604eb503568688b28d3169fea7fbb88ed7e@changeid Signed-off-by: Luca Coelho <[email protected]>
1 parent e80bfd1 commit 0a8159c

File tree

4 files changed

+1
-9
lines changed

4 files changed

+1
-9
lines changed

drivers/net/wireless/intel/iwlwifi/iwl-trans.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ int iwl_trans_send_cmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
181181
if (!(cmd->flags & CMD_ASYNC))
182182
lock_map_acquire_read(&trans->sync_cmd_lockdep_map);
183183

184-
if (trans->wide_cmd_header && !iwl_cmd_groupid(cmd->id))
184+
if (!iwl_cmd_groupid(cmd->id))
185185
cmd->id = DEF_ID(cmd->id);
186186

187187
ret = trans->ops->send_cmd(trans, cmd);

drivers/net/wireless/intel/iwlwifi/iwl-trans.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,6 @@ struct iwl_trans_txqs {
960960
* @hw_id_str: a string with info about HW ID. Set during transport allocation.
961961
* @pm_support: set to true in start_hw if link pm is supported
962962
* @ltr_enabled: set to true if the LTR is enabled
963-
* @wide_cmd_header: true when ucode supports wide command header format
964963
* @num_rx_queues: number of RX queues allocated by the transport;
965964
* the transport must set this before calling iwl_drv_start()
966965
* @iml_len: the length of the image loader
@@ -1000,7 +999,6 @@ struct iwl_trans {
1000999

10011000
const struct iwl_hcmd_arr *command_groups;
10021001
int command_groups_size;
1003-
bool wide_cmd_header;
10041002

10051003
u8 num_rx_queues;
10061004

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
757757
trans_cfg.rx_buf_size = rb_size_default;
758758
}
759759

760-
trans->wide_cmd_header = true;
761760
trans_cfg.bc_table_dword =
762761
mvm->trans->trans_cfg->device_family < IWL_DEVICE_FAMILY_AX210;
763762

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,11 +1538,6 @@ static int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,
15381538
const u8 *cmddata[IWL_MAX_CMD_TBS_PER_TFD];
15391539
u16 cmdlen[IWL_MAX_CMD_TBS_PER_TFD];
15401540

1541-
if (WARN(!trans->wide_cmd_header &&
1542-
group_id > IWL_ALWAYS_LONG_GROUP,
1543-
"unsupported wide command %#x\n", cmd->id))
1544-
return -EINVAL;
1545-
15461541
if (group_id != 0) {
15471542
copy_size = sizeof(struct iwl_cmd_header_wide);
15481543
cmd_size = sizeof(struct iwl_cmd_header_wide);

0 commit comments

Comments
 (0)