RDMA/mlx4: Redo TX checksum offload in line with docs

[linux.git] / drivers / infiniband / hw / mlx4 / cq.c

diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index 306b21281fa2ac4c29dc5bc9554c6bde9590d876..72eeb9a85bc50da9994edc853fe9871842647abc 100644 (file)
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -568,18 +568,13 @@ static void mlx4_ib_handle_error_cqe(struct mlx4_err_cqe *cqe,
        wc->vendor_err = cqe->vendor_err_syndrome;
 }
 
-static int mlx4_ib_ipoib_csum_ok(__be16 status, __be16 checksum)
+static int mlx4_ib_ipoib_csum_ok(__be16 status, u8 badfcs_enc, __be16 checksum)
 {
-       return ((status & cpu_to_be16(MLX4_CQE_STATUS_IPV4      |
-                                     MLX4_CQE_STATUS_IPV4F     |
-                                     MLX4_CQE_STATUS_IPV4OPT   |
-                                     MLX4_CQE_STATUS_IPV6      |
-                                     MLX4_CQE_STATUS_IPOK)) ==
-               cpu_to_be16(MLX4_CQE_STATUS_IPV4        |
-                           MLX4_CQE_STATUS_IPOK))              &&
-               (status & cpu_to_be16(MLX4_CQE_STATUS_UDP       |
-                                     MLX4_CQE_STATUS_TCP))     &&
-               checksum == cpu_to_be16(0xffff);
+       return ((badfcs_enc & MLX4_CQE_STATUS_L4_CSUM) ||
+               ((status & cpu_to_be16(MLX4_CQE_STATUS_IPOK)) &&
+                (status & cpu_to_be16(MLX4_CQE_STATUS_TCP |
+                                      MLX4_CQE_STATUS_UDP)) &&
+                (checksum == cpu_to_be16(0xffff))));
 }
 
 static void use_tunnel_data(struct mlx4_ib_qp *qp, struct mlx4_ib_cq *cq, struct ib_wc *wc,
@@ -855,6 +850,7 @@ static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq,
                wc->wc_flags      |= g_mlpath_rqpn & 0x80000000 ? IB_WC_GRH : 0;
                wc->pkey_index     = be32_to_cpu(cqe->immed_rss_invalid) & 0x7f;
                wc->wc_flags      |= mlx4_ib_ipoib_csum_ok(cqe->status,
+                                       cqe->badfcs_enc,
                                        cqe->checksum) ? IB_WC_IP_CSUM_OK : 0;
                if (is_eth) {
                        wc->slid = 0;