diff options
| author | Moni Shoua <monis@mellanox.com> | 2016-01-28 17:51:50 +0200 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-02-02 16:42:22 -0500 |
| commit | 1c5e08099022942cd530c99f5f292c735acc288f (patch) | |
| tree | 901ba44d9656e654933cd5ed3439a254bd35b909 /drivers/infiniband/core/ud_header.c | |
| parent | 01581fb89e5a6d41d06132aefe105a506f04ce1e (diff) | |
| download | linux-1c5e08099022942cd530c99f5f292c735acc288f.tar.gz linux-1c5e08099022942cd530c99f5f292c735acc288f.tar.bz2 linux-1c5e08099022942cd530c99f5f292c735acc288f.zip | |
IB/core: Set correct payload length for RoCEv2 over IPv6
For GSI QP traffic, the count of the udp header bytes was missing from
the IPv6 header, fix that.
Fixes: 25f40220e56b ('IB/core: Initialize UD header structure with IP
and UDP headers')
Signed-off-by: Moni Shoua <monis@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/core/ud_header.c')
| -rw-r--r-- | drivers/infiniband/core/ud_header.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/infiniband/core/ud_header.c b/drivers/infiniband/core/ud_header.c index 19837d270278..2116132568e7 100644 --- a/drivers/infiniband/core/ud_header.c +++ b/drivers/infiniband/core/ud_header.c @@ -322,6 +322,8 @@ int ib_ud_header_init(int payload_bytes, int immediate_present, struct ib_ud_header *header) { + size_t udp_bytes = udp_present ? IB_UDP_BYTES : 0; + grh_present = grh_present && !ip_version; memset(header, 0, sizeof *header); @@ -353,7 +355,8 @@ int ib_ud_header_init(int payload_bytes, if (ip_version == 6 || grh_present) { header->grh.ip_version = 6; header->grh.payload_length = - cpu_to_be16((IB_BTH_BYTES + + cpu_to_be16((udp_bytes + + IB_BTH_BYTES + IB_DETH_BYTES + payload_bytes + 4 + /* ICRC */ @@ -362,8 +365,6 @@ int ib_ud_header_init(int payload_bytes, } if (ip_version == 4) { - int udp_bytes = udp_present ? IB_UDP_BYTES : 0; - header->ip4.ver = 4; /* version 4 */ header->ip4.hdr_len = 5; /* 5 words */ header->ip4.tot_len = |