RDMA/bnxt_re: fix for "bnxt_en: Update to firmware interface spec 1.7.0."
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 15 Feb 2017 00:30:03 +0000 (11:30 +1100)
committerDoug Ledford <dledford@redhat.com>
Wed, 22 Feb 2017 20:40:17 +0000 (15:40 -0500)
When the firmware interface spec was updated, a constant element was
renamed.  The rename missed the instances in the bnxt_re driver
because it wasn't upstream yet.  This updates the bnxt_re driver
with the rename.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/hw/bnxt_re/main.c

index 6b9f1178050f8a34a21f9434d1403ae2ea320c7e..bd452a92b386dfe4bcde2dd64c3fd97b0a0f3081 100644 (file)
@@ -228,7 +228,7 @@ static int bnxt_re_net_ring_free(struct bnxt_re_dev *rdev, u16 fw_ring_id,
        }
 
        bnxt_re_init_hwrm_hdr(rdev, (void *)&req, HWRM_RING_FREE, -1, -1);
-       req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
+       req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;
        req.ring_id = cpu_to_le16(fw_ring_id);
        bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp,
                            sizeof(resp), DFLT_HWRM_CMD_TIMEOUT);
@@ -268,7 +268,7 @@ static int bnxt_re_net_ring_alloc(struct bnxt_re_dev *rdev, dma_addr_t *dma_arr,
        /* Association of ring index with doorbell index and MSIX number */
        req.logical_id = cpu_to_le16(map_index);
        req.length = cpu_to_le32(ring_mask + 1);
-       req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
+       req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;
        req.int_mode = RING_ALLOC_REQ_INT_MODE_MSIX;
        bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp,
                            sizeof(resp), DFLT_HWRM_CMD_TIMEOUT);