iwlegacy: get rid of ctx->rxon_timing_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 8de8355c523ce7d00fa10cc65a413252b59b5328..5ca8a784436f27dd2bf27508a3897dd547575adf 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_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;

diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 2368f3ab02b5782233c932411f56b79a2dfe5209..9539acc132a34d2d7dc0e993b9309e7c0a3d2c5a 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_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;

diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index 2b5622695cc70e5e898170e8a879d61d921896d1..902521469e1948ef894a963c29185ab77888dccf 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -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);

diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index 80c60e57de3c45368ac4f541aee453e10df58f53..d1d505580b1d6e36dfa7f291b15ade87eb60c233 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_assoc_cmd, rxon_timing_cmd;
+       u8 rxon_assoc_cmd;
        u8 qos_cmd;
        u8 wep_key_cmd;