From 6790ebcb250c35d0ef580efd0c976ca88ba5d7de Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Fri, 3 Feb 2012 17:31:39 +0100 Subject: [PATCH] --- yaml --- r: 290374 b: refs/heads/master c: 63d0f0c5512e29f87ed2e1612bb637d857f3b345 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlegacy/3945-mac.c | 1 - trunk/drivers/net/wireless/iwlegacy/4965-mac.c | 1 - trunk/drivers/net/wireless/iwlegacy/common.c | 2 +- trunk/drivers/net/wireless/iwlegacy/common.h | 2 +- 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 19af98ca9faf..e357f365a408 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6122d18236837ed7f264632e6b27d5cb3005add2 +refs/heads/master: 63d0f0c5512e29f87ed2e1612bb637d857f3b345 diff --git a/trunk/drivers/net/wireless/iwlegacy/3945-mac.c b/trunk/drivers/net/wireless/iwlegacy/3945-mac.c index 8de8355c523c..5ca8a784436f 100644 --- a/trunk/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/trunk/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/trunk/drivers/net/wireless/iwlegacy/4965-mac.c b/trunk/drivers/net/wireless/iwlegacy/4965-mac.c index 2368f3ab02b5..9539acc132a3 100644 --- a/trunk/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/trunk/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/trunk/drivers/net/wireless/iwlegacy/common.c b/trunk/drivers/net/wireless/iwlegacy/common.c index 2b5622695cc7..902521469e19 100644 --- a/trunk/drivers/net/wireless/iwlegacy/common.c +++ b/trunk/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/trunk/drivers/net/wireless/iwlegacy/common.h b/trunk/drivers/net/wireless/iwlegacy/common.h index 80c60e57de3c..d1d505580b1d 100644 --- a/trunk/drivers/net/wireless/iwlegacy/common.h +++ b/trunk/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;