[SCSI] cxgb4/cxgb4vf: Chelsio FCoE offload driver submission (common header updates).

[karo-tx-linux.git] / drivers / net / ethernet / chelsio / cxgb4vf / sge.c

diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
index f16745f4b36bf2b2c30bbe8740029aa4327b5020..92170d50d9d8d0a1fa6b4ed1508de34d1855ae10 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
@@ -536,7 +536,7 @@ static inline void ring_fl_db(struct adapter *adapter, struct sge_fl *fl)
        if (fl->pend_cred >= FL_PER_EQ_UNIT) {
                wmb();
                t4_write_reg(adapter, T4VF_SGE_BASE_ADDR + SGE_VF_KDOORBELL,
-                            DBPRIO |
+                            DBPRIO(1) |
                             QID(fl->cntxt_id) |
                             PIDX(fl->pend_cred / FL_PER_EQ_UNIT));
                fl->pend_cred %= FL_PER_EQ_UNIT;
@@ -952,7 +952,7 @@ static inline void ring_tx_db(struct adapter *adapter, struct sge_txq *tq,
         * Warn if we write doorbells with the wrong priority and write
         * descriptors before telling HW.
         */
-       WARN_ON((QID(tq->cntxt_id) | PIDX(n)) & DBPRIO);
+       WARN_ON((QID(tq->cntxt_id) | PIDX(n)) & DBPRIO(1));
        wmb();
        t4_write_reg(adapter, T4VF_SGE_BASE_ADDR + SGE_VF_KDOORBELL,
                     QID(tq->cntxt_id) | PIDX(n));
@@ -2126,8 +2126,8 @@ int t4vf_sge_alloc_rxq(struct adapter *adapter, struct sge_rspq *rspq,
                cmd.iqns_to_fl0congen =
                        cpu_to_be32(
                                FW_IQ_CMD_FL0HOSTFCMODE(SGE_HOSTFCMODE_NONE) |
-                               FW_IQ_CMD_FL0PACKEN |
-                               FW_IQ_CMD_FL0PADEN);
+                               FW_IQ_CMD_FL0PACKEN(1) |
+                               FW_IQ_CMD_FL0PADEN(1));
                cmd.fl0dcaen_to_fl0cidxfthresh =
                        cpu_to_be16(
                                FW_IQ_CMD_FL0FBMIN(SGE_FETCHBURSTMIN_64B) |