qed*: HSI renaming for different types of HW

[linux-2.6-microblaze.git] / drivers / net / ethernet / qlogic / qed / qed_spq.c

diff --git a/drivers/net/ethernet/qlogic/qed/qed_spq.c b/drivers/net/ethernet/qlogic/qed/qed_spq.c
index be48d9a..217b62a 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_spq.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_spq.c
@@ -215,7 +215,7 @@ static int qed_spq_fill_entry(struct qed_hwfn *p_hwfn,
 static void qed_spq_hw_initialize(struct qed_hwfn *p_hwfn,
                                  struct qed_spq *p_spq)
 {
-       struct core_conn_context *p_cxt;
+       struct e4_core_conn_context *p_cxt;
        struct qed_cxt_info cxt_info;
        u16 physical_q;
        int rc;
@@ -233,11 +233,11 @@ static void qed_spq_hw_initialize(struct qed_hwfn *p_hwfn,
        p_cxt = cxt_info.p_cxt;
 
        SET_FIELD(p_cxt->xstorm_ag_context.flags10,
-                 XSTORM_CORE_CONN_AG_CTX_DQ_CF_EN, 1);
+                 E4_XSTORM_CORE_CONN_AG_CTX_DQ_CF_EN, 1);
        SET_FIELD(p_cxt->xstorm_ag_context.flags1,
-                 XSTORM_CORE_CONN_AG_CTX_DQ_CF_ACTIVE, 1);
+                 E4_XSTORM_CORE_CONN_AG_CTX_DQ_CF_ACTIVE, 1);
        SET_FIELD(p_cxt->xstorm_ag_context.flags9,
-                 XSTORM_CORE_CONN_AG_CTX_CONSOLID_PROD_CF_EN, 1);
+                 E4_XSTORM_CORE_CONN_AG_CTX_CONSOLID_PROD_CF_EN, 1);
 
        /* QM physical queue */
        physical_q = qed_get_cm_pq_idx(p_hwfn, PQ_FLAGS_LB);