iwlegacy: move qos_data out of ctx structure

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

diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index 7f4c6bf419950f925a60ed0b9b40d83d82fcd356..c93fa1b85da578ee683d48b480ae136061fd4c2a 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -4496,15 +4496,15 @@ il_mac_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,
 
        spin_lock_irqsave(&il->lock, flags);
 
-       il->ctx.qos_data.def_qos_parm.ac[q].cw_min =
+       il->qos_data.def_qos_parm.ac[q].cw_min =
            cpu_to_le16(params->cw_min);
-       il->ctx.qos_data.def_qos_parm.ac[q].cw_max =
+       il->qos_data.def_qos_parm.ac[q].cw_max =
            cpu_to_le16(params->cw_max);
-       il->ctx.qos_data.def_qos_parm.ac[q].aifsn = params->aifs;
-       il->ctx.qos_data.def_qos_parm.ac[q].edca_txop =
+       il->qos_data.def_qos_parm.ac[q].aifsn = params->aifs;
+       il->qos_data.def_qos_parm.ac[q].edca_txop =
            cpu_to_le16((params->txop * 32));
 
-       il->ctx.qos_data.def_qos_parm.ac[q].reserved1 = 0;
+       il->qos_data.def_qos_parm.ac[q].reserved1 = 0;
 
        spin_unlock_irqrestore(&il->lock, flags);
 
@@ -5230,20 +5230,20 @@ il_update_qos(struct il_priv *il, struct il_rxon_context *ctx)
        if (!ctx->is_active)
                return;
 
-       ctx->qos_data.def_qos_parm.qos_flags = 0;
+       il->qos_data.def_qos_parm.qos_flags = 0;
 
-       if (ctx->qos_data.qos_active)
-               ctx->qos_data.def_qos_parm.qos_flags |=
+       if (il->qos_data.qos_active)
+               il->qos_data.def_qos_parm.qos_flags |=
                    QOS_PARAM_FLG_UPDATE_EDCA_MSK;
 
        if (ctx->ht.enabled)
-               ctx->qos_data.def_qos_parm.qos_flags |= QOS_PARAM_FLG_TGN_MSK;
+               il->qos_data.def_qos_parm.qos_flags |= QOS_PARAM_FLG_TGN_MSK;
 
        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->qos_data.qos_active, il->qos_data.def_qos_parm.qos_flags);
 
        il_send_cmd_pdu_async(il, C_QOS_PARAM, sizeof(struct il_qosparam_cmd),
-                             &ctx->qos_data.def_qos_parm, NULL);
+                             &il->qos_data.def_qos_parm, NULL);
 }
 
 /**
@@ -5596,7 +5596,7 @@ il_mac_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                unsigned long flags;
 
                spin_lock_irqsave(&il->lock, flags);
-               ctx->qos_data.qos_active = bss_conf->qos;
+               il->qos_data.qos_active = bss_conf->qos;
                il_update_qos(il, ctx);
                spin_unlock_irqrestore(&il->lock, flags);
        }

diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index eddf22d4f1b2bf02b66e30f60bb39ed6edd73a4f..18375cb7904c1ea80912f1a697b632aa0c46bc1f 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -1165,8 +1165,6 @@ struct il_rxon_context {
         */
        bool always_active, is_active;
 
-       struct il_qos_info qos_data;
-
        struct {
                bool non_gf_sta_present;
                u8 protection;
@@ -1278,6 +1276,8 @@ struct il_priv {
 
        struct il_rxon_context ctx;
 
+       struct il_qos_info qos_data;
+
        /*
         * We declare this const so it can only be
         * changed via explicit cast within the

diff --git a/drivers/net/wireless/iwlegacy/debug.c b/drivers/net/wireless/iwlegacy/debug.c
index f3cb45e53c05c1a5744fccd6b185eec34e017531..3a9609a88748e4393284fbb4f95d42b7d22f4adc 100644 (file)
--- a/drivers/net/wireless/iwlegacy/debug.c
+++ b/drivers/net/wireless/iwlegacy/debug.c
@@ -644,7 +644,6 @@ il_dbgfs_qos_read(struct file *file, char __user *user_buf, size_t count,
                  loff_t *ppos)
 {
        struct il_priv *il = file->private_data;
-       struct il_rxon_context *ctx = &il->ctx;
        int pos = 0, i;
        char buf[256];
        const size_t bufsz = sizeof(buf);
@@ -656,10 +655,10 @@ il_dbgfs_qos_read(struct file *file, char __user *user_buf, size_t count,
                pos +=
                    scnprintf(buf + pos, bufsz - pos,
                              "AC[%d]\t%u\t%u\t%u\t%u\n", i,
-                             ctx->qos_data.def_qos_parm.ac[i].cw_min,
-                             ctx->qos_data.def_qos_parm.ac[i].cw_max,
-                             ctx->qos_data.def_qos_parm.ac[i].aifsn,
-                             ctx->qos_data.def_qos_parm.ac[i].edca_txop);
+                             il->qos_data.def_qos_parm.ac[i].cw_min,
+                             il->qos_data.def_qos_parm.ac[i].cw_max,
+                             il->qos_data.def_qos_parm.ac[i].aifsn,
+                             il->qos_data.def_qos_parm.ac[i].edca_txop);
        }
 
        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);