iwlegacy: get rid of ctx->rxon_cmd

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index 980566fdb81a6d2ee90084e144bf7c1d5efb8c9f..8de8355c523ce7d00fa10cc65a413252b59b5328 100644 (file)
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -3619,7 +3619,6 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        il->ctx.ctxid = 0;
 
-       il->ctx.rxon_cmd = C_RXON;
        il->ctx.rxon_timing_cmd = C_RXON_TIMING;
        il->ctx.rxon_assoc_cmd = C_RXON_ASSOC;
        il->ctx.qos_cmd = C_QOS_PARAM;

diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 6a77f41dd3670ca5ccddd7c6827a5e0952cfba85..2368f3ab02b5782233c932411f56b79a2dfe5209 100644 (file)
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -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_cmd = C_RXON;
        il->ctx.rxon_timing_cmd = C_RXON_TIMING;
        il->ctx.rxon_assoc_cmd = C_RXON_ASSOC;
        il->ctx.qos_cmd = C_QOS_PARAM;

diff --git a/drivers/net/wireless/iwlegacy/4965.c b/drivers/net/wireless/iwlegacy/4965.c
index b34de14331237f9387bbce2eaf63f4c89e9f6e2d..8926108118f6f77787beb3b9f330d9fc06800793 100644 (file)
--- a/drivers/net/wireless/iwlegacy/4965.c
+++ b/drivers/net/wireless/iwlegacy/4965.c
@@ -1472,7 +1472,7 @@ il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
                active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
 
                ret =
-                   il_send_cmd_pdu(il, ctx->rxon_cmd,
+                   il_send_cmd_pdu(il, C_RXON,
                                    sizeof(struct il_rxon_cmd), active_rxon);
 
                /* If the mask clearing failed then we set
@@ -1503,7 +1503,7 @@ il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
         */
        if (!new_assoc) {
                ret =
-                   il_send_cmd_pdu(il, ctx->rxon_cmd,
+                   il_send_cmd_pdu(il, C_RXON,
                                    sizeof(struct il_rxon_cmd), &il->staging);
                if (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)
                 * RXON assoc doesn't clear the station table in uCode,
                 */
                ret =
-                   il_send_cmd_pdu(il, ctx->rxon_cmd,
+                   il_send_cmd_pdu(il, C_RXON,
                                    sizeof(struct il_rxon_cmd), &il->staging);
                if (ret) {
                        IL_ERR("Error setting new RXON (%d)\n", ret);

diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index ba801c7d9ad4c503e6d38002ee430007c017c3bd..80c60e57de3c45368ac4f541aee453e10df58f53 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -1175,7 +1175,7 @@ struct il_rxon_context {
 
        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 wep_key_cmd;