Commit 6122d182 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville

iwlegacy: get rid of ctx->rxon_cmd

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c8b03958
...@@ -3619,7 +3619,6 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -3619,7 +3619,6 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
il->ctx.ctxid = 0; il->ctx.ctxid = 0;
il->ctx.rxon_cmd = C_RXON;
il->ctx.rxon_timing_cmd = C_RXON_TIMING; il->ctx.rxon_timing_cmd = C_RXON_TIMING;
il->ctx.rxon_assoc_cmd = C_RXON_ASSOC; il->ctx.rxon_assoc_cmd = C_RXON_ASSOC;
il->ctx.qos_cmd = C_QOS_PARAM; il->ctx.qos_cmd = C_QOS_PARAM;
......
...@@ -6135,7 +6135,6 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -6135,7 +6135,6 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
il->ctx.always_active = true; il->ctx.always_active = true;
il->ctx.is_active = true; il->ctx.is_active = true;
il->ctx.rxon_cmd = C_RXON;
il->ctx.rxon_timing_cmd = C_RXON_TIMING; il->ctx.rxon_timing_cmd = C_RXON_TIMING;
il->ctx.rxon_assoc_cmd = C_RXON_ASSOC; il->ctx.rxon_assoc_cmd = C_RXON_ASSOC;
il->ctx.qos_cmd = C_QOS_PARAM; il->ctx.qos_cmd = C_QOS_PARAM;
......
...@@ -1472,7 +1472,7 @@ il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx) ...@@ -1472,7 +1472,7 @@ il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK; active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
ret = ret =
il_send_cmd_pdu(il, ctx->rxon_cmd, il_send_cmd_pdu(il, C_RXON,
sizeof(struct il_rxon_cmd), active_rxon); sizeof(struct il_rxon_cmd), active_rxon);
/* If the mask clearing failed then we set /* If the mask clearing failed then we set
...@@ -1503,7 +1503,7 @@ il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx) ...@@ -1503,7 +1503,7 @@ il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
*/ */
if (!new_assoc) { if (!new_assoc) {
ret = ret =
il_send_cmd_pdu(il, ctx->rxon_cmd, il_send_cmd_pdu(il, C_RXON,
sizeof(struct il_rxon_cmd), &il->staging); sizeof(struct il_rxon_cmd), &il->staging);
if (ret) { if (ret) {
IL_ERR("Error setting new RXON (%d)\n", ret); IL_ERR("Error setting new RXON (%d)\n", ret);
...@@ -1525,7 +1525,7 @@ il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx) ...@@ -1525,7 +1525,7 @@ il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
* RXON assoc doesn't clear the station table in uCode, * RXON assoc doesn't clear the station table in uCode,
*/ */
ret = ret =
il_send_cmd_pdu(il, ctx->rxon_cmd, il_send_cmd_pdu(il, C_RXON,
sizeof(struct il_rxon_cmd), &il->staging); sizeof(struct il_rxon_cmd), &il->staging);
if (ret) { if (ret) {
IL_ERR("Error setting new RXON (%d)\n", ret); IL_ERR("Error setting new RXON (%d)\n", ret);
......
...@@ -1175,7 +1175,7 @@ struct il_rxon_context { ...@@ -1175,7 +1175,7 @@ struct il_rxon_context {
u8 bcast_sta_id, ap_sta_id; u8 bcast_sta_id, ap_sta_id;
u8 rxon_cmd, rxon_assoc_cmd, rxon_timing_cmd; u8 rxon_assoc_cmd, rxon_timing_cmd;
u8 qos_cmd; u8 qos_cmd;
u8 wep_key_cmd; u8 wep_key_cmd;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment