Skip to content

Commit

Permalink
iwlegacy: get rid of ctx->rxon_timing_cmd
Browse files Browse the repository at this point in the history
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Stanislaw Gruszka authored and John W. Linville committed Feb 6, 2012
1 parent 6122d18 commit 63d0f0c
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 4 deletions.
1 change: 0 additions & 1 deletion drivers/net/wireless/iwlegacy/3945-mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -3619,7 +3619,6 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

il->ctx.ctxid = 0;

il->ctx.rxon_timing_cmd = C_RXON_TIMING;
il->ctx.rxon_assoc_cmd = C_RXON_ASSOC;
il->ctx.qos_cmd = C_QOS_PARAM;
il->ctx.ap_sta_id = IL_AP_ID;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/wireless/iwlegacy/4965-mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -6135,7 +6135,6 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

il->ctx.always_active = true;
il->ctx.is_active = true;
il->ctx.rxon_timing_cmd = C_RXON_TIMING;
il->ctx.rxon_assoc_cmd = C_RXON_ASSOC;
il->ctx.qos_cmd = C_QOS_PARAM;
il->ctx.ap_sta_id = IL_AP_ID;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/iwlegacy/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -3664,7 +3664,7 @@ il_send_rxon_timing(struct il_priv *il, struct il_rxon_context *ctx)
le32_to_cpu(il->timing.beacon_init_val),
le16_to_cpu(il->timing.atim_win));

return il_send_cmd_pdu(il, il->ctx.rxon_timing_cmd, sizeof(il->timing),
return il_send_cmd_pdu(il, C_RXON_TIMING, sizeof(il->timing),
&il->timing);
}
EXPORT_SYMBOL(il_send_rxon_timing);
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/iwlegacy/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,7 @@ struct il_rxon_context {

u8 bcast_sta_id, ap_sta_id;

u8 rxon_assoc_cmd, rxon_timing_cmd;
u8 rxon_assoc_cmd;
u8 qos_cmd;
u8 wep_key_cmd;

Expand Down

0 comments on commit 63d0f0c

Please sign in to comment.