diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-14 19:30:03 -0500 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2017-02-22 15:40:17 -0500 |
commit | db690328a7df0b507f7d59de0c7e1bbe8f4b9e6a (patch) | |
tree | df5792b16b283fcc470bb62b1677cfb03b716e81 | |
parent | f2625f7db4dd0bbd16a9c7d2950e7621f9aa57ad (diff) |
RDMA/bnxt_re: fix for "bnxt_en: Update to firmware interface spec 1.7.0."
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>
-rw-r--r-- | drivers/infiniband/hw/bnxt_re/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c index 6b9f1178050f..bd452a92b386 100644 --- a/drivers/infiniband/hw/bnxt_re/main.c +++ b/drivers/infiniband/hw/bnxt_re/main.c | |||
@@ -228,7 +228,7 @@ static int bnxt_re_net_ring_free(struct bnxt_re_dev *rdev, u16 fw_ring_id, | |||
228 | } | 228 | } |
229 | 229 | ||
230 | bnxt_re_init_hwrm_hdr(rdev, (void *)&req, HWRM_RING_FREE, -1, -1); | 230 | bnxt_re_init_hwrm_hdr(rdev, (void *)&req, HWRM_RING_FREE, -1, -1); |
231 | req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL; | 231 | req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL; |
232 | req.ring_id = cpu_to_le16(fw_ring_id); | 232 | req.ring_id = cpu_to_le16(fw_ring_id); |
233 | bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp, | 233 | bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp, |
234 | sizeof(resp), DFLT_HWRM_CMD_TIMEOUT); | 234 | 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, | |||
268 | /* Association of ring index with doorbell index and MSIX number */ | 268 | /* Association of ring index with doorbell index and MSIX number */ |
269 | req.logical_id = cpu_to_le16(map_index); | 269 | req.logical_id = cpu_to_le16(map_index); |
270 | req.length = cpu_to_le32(ring_mask + 1); | 270 | req.length = cpu_to_le32(ring_mask + 1); |
271 | req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL; | 271 | req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL; |
272 | req.int_mode = RING_ALLOC_REQ_INT_MODE_MSIX; | 272 | req.int_mode = RING_ALLOC_REQ_INT_MODE_MSIX; |
273 | bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp, | 273 | bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp, |
274 | sizeof(resp), DFLT_HWRM_CMD_TIMEOUT); | 274 | sizeof(resp), DFLT_HWRM_CMD_TIMEOUT); |