diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-25 12:07:13 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-25 12:07:13 +0300 |
| commit | 3a9ff4fd04cc6ad199419508c8ea6eb839e0262d (patch) | |
| tree | f3933b082ea1743e63e93a16190c6ce32175c96a /drivers/infiniband/hw/i40iw/i40iw_status.h | |
| parent | 9c8783201cb58e9af8ddeb0cc68f37b0a44ca16c (diff) | |
| parent | 90a6cd503982bfd33ce8c70eb49bd2dd33bc6325 (diff) | |
| download | linux-3a9ff4fd04cc6ad199419508c8ea6eb839e0262d.tar.xz | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/infiniband/hw/i40iw/i40iw_status.h')
| -rw-r--r-- | drivers/infiniband/hw/i40iw/i40iw_status.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/i40iw/i40iw_status.h b/drivers/infiniband/hw/i40iw/i40iw_status.h index 91c421762f06..f7013f11d808 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_status.h +++ b/drivers/infiniband/hw/i40iw/i40iw_status.h @@ -62,7 +62,7 @@ enum i40iw_status_code { I40IW_ERR_INVALID_ALIGNMENT = -23, I40IW_ERR_FLUSHED_QUEUE = -24, I40IW_ERR_INVALID_PUSH_PAGE_INDEX = -25, - I40IW_ERR_INVALID_IMM_DATA_SIZE = -26, + I40IW_ERR_INVALID_INLINE_DATA_SIZE = -26, I40IW_ERR_TIMEOUT = -27, I40IW_ERR_OPCODE_MISMATCH = -28, I40IW_ERR_CQP_COMPL_ERROR = -29, |