iwlegacy: get rid of qos_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 e5857df2df27ec00091e2a877e5bad59b8b3acf1..bbbac26d8f4b465e9b96b2b7d08380909b2ca069 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.qos_cmd = C_QOS_PARAM;
        il->ctx.ap_sta_id = IL_AP_ID;
        il->ctx.wep_key_cmd = C_WEPKEY;
        il->ctx.interface_modes =

diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index bd83299be3191171a72e48cf5f395fb909638db8..2ee5de38bb317d9746dd39622ae557859976073d 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.qos_cmd = C_QOS_PARAM;
        il->ctx.ap_sta_id = IL_AP_ID;
        il->ctx.wep_key_cmd = C_WEPKEY;
        il->ctx.ac_to_fifo = il4965_bss_ac_to_fifo;

diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index 902521469e1948ef894a963c29185ab77888dccf..b95f832b14eaa2444ea47be4ea768948f677c204 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -5269,7 +5269,7 @@ il_update_qos(struct il_priv *il, struct il_rxon_context *ctx)
        D_QOS("send QoS cmd with Qos active=%d FLAGS=0x%X\n",
              ctx->qos_data.qos_active, ctx->qos_data.def_qos_parm.qos_flags);
 
-       il_send_cmd_pdu_async(il, ctx->qos_cmd, sizeof(struct il_qosparam_cmd),
+       il_send_cmd_pdu_async(il, C_QOS_PARAM, sizeof(struct il_qosparam_cmd),
                              &ctx->qos_data.def_qos_parm, NULL);
 }
 

diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index d8e309a1756a7b651a00949c104d6308ca85c514..b08ddd13443027d32500050eaba1b747bdaaa63d 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -1175,7 +1175,6 @@ struct il_rxon_context {
 
        u8 bcast_sta_id, ap_sta_id;
 
-       u8 qos_cmd;
        u8 wep_key_cmd;
 
        struct il_wep_key wep_keys[WEP_KEYS_MAX];