From 1e54b2704fc4ded1bad425c5fe46e4d64044d24a Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Fri, 3 Feb 2012 17:31:40 +0100 Subject: [PATCH] --- yaml --- r: 290375 b: refs/heads/master c: 5e349f02963acc2c3607119e6e64f0cbc8d23e17 h: refs/heads/master i: 290373: f41874ae59f0d07c0caa6ce0825946f11a13d30f 290371: 539e897fdbc5ba69f0f10f8d8b943c6c7a94545a 290367: d9892f0803d65c6feecd1f3258bc337cd2d96720 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.h | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e357f365a408..50185d0e76b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63d0f0c5512e29f87ed2e1612bb637d857f3b345 +refs/heads/master: 5e349f02963acc2c3607119e6e64f0cbc8d23e17 diff --git a/trunk/drivers/net/wireless/iwlegacy/3945-mac.c b/trunk/drivers/net/wireless/iwlegacy/3945-mac.c index 5ca8a784436f..e5857df2df27 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_assoc_cmd = C_RXON_ASSOC; il->ctx.qos_cmd = C_QOS_PARAM; il->ctx.ap_sta_id = IL_AP_ID; il->ctx.wep_key_cmd = C_WEPKEY; diff --git a/trunk/drivers/net/wireless/iwlegacy/4965-mac.c b/trunk/drivers/net/wireless/iwlegacy/4965-mac.c index 9539acc132a3..bd83299be319 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_assoc_cmd = C_RXON_ASSOC; il->ctx.qos_cmd = C_QOS_PARAM; il->ctx.ap_sta_id = IL_AP_ID; il->ctx.wep_key_cmd = C_WEPKEY; diff --git a/trunk/drivers/net/wireless/iwlegacy/common.h b/trunk/drivers/net/wireless/iwlegacy/common.h index d1d505580b1d..d8e309a1756a 100644 --- a/trunk/drivers/net/wireless/iwlegacy/common.h +++ b/trunk/drivers/net/wireless/iwlegacy/common.h @@ -1175,7 +1175,6 @@ struct il_rxon_context { u8 bcast_sta_id, ap_sta_id; - u8 rxon_assoc_cmd; u8 qos_cmd; u8 wep_key_cmd;