diff options
| author | David S. Miller | 2017-09-26 20:22:03 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-09-26 20:22:03 +0200 |
| commit | 5b2ef20df930a03ddc60bc5eac1ad36860420de7 (patch) | |
| tree | 67bca013cbe9090f430e7bf3b71db41ed65a2568 /include | |
| parent | ldmvsw: Remove redundant unlikely() (diff) | |
| parent | qed: iWARP - Add check for errors on a SYN packet (diff) | |
| download | kernel-qcow2-linux-5b2ef20df930a03ddc60bc5eac1ad36860420de7.tar.gz kernel-qcow2-linux-5b2ef20df930a03ddc60bc5eac1ad36860420de7.tar.xz kernel-qcow2-linux-5b2ef20df930a03ddc60bc5eac1ad36860420de7.zip | |
Merge branch 'qed-iWARP-fixes-and-enhancements'
Michal Kalderon says:
====================
qed: iWARP fixes and enhancements
This patch series includes several fixes and enhancements
related to iWARP.
Patch #1 is actually the last of the initial iWARP submission.
It has been delayed until now as I wanted to make sure that qedr
supports iWARP prior to enabling iWARP device detection.
iWARP changes in RDMA tree have been accepted and targeted at
kernel 4.15, therefore, all iWARP fixes for this cycle are
submitted to net-next.
Changes from v1->v2
- Added "Fixes:" tag to commit message of patch #3
====================
Signed-off by: Michal.Kalderon@cavium.com
Signed-off-by: Ariel Elior <Ariel.Elior@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/qed/qed_ll2_if.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/qed/qed_ll2_if.h b/include/linux/qed/qed_ll2_if.h index dd7a3b86bb9e..89fa0bbd54f3 100644 --- a/include/linux/qed/qed_ll2_if.h +++ b/include/linux/qed/qed_ll2_if.h @@ -101,6 +101,7 @@ struct qed_ll2_comp_rx_data { void *cookie; dma_addr_t rx_buf_addr; u16 parse_flags; + u16 err_flags; u16 vlan; bool b_last_packet; u8 connection_handle; |