IB/mlx4_ib: Remove local invalidate segment unused fields

Remove unused fields from the local invalidate WQE segment structure.

Signed-off-by: Haggai Eran <haggaie@mellanox.com>
Signed-off-by: Shani Michaeli <shanim@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 19e0637220b988a4ef15f421227fdca13586e76e..c6dde71b46420e01000f8804bb7cfa36b8ecfd1d 100644 (file)
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -1983,10 +1983,8 @@ static void set_fmr_seg(struct mlx4_wqe_fmr_seg *fseg, struct ib_send_wr *wr)
 
 static void set_local_inv_seg(struct mlx4_wqe_local_inval_seg *iseg, u32 rkey)
 {
-       iseg->flags     = 0;
-       iseg->mem_key   = cpu_to_be32(rkey);
-       iseg->guest_id  = 0;
-       iseg->pa        = 0;
+       memset(iseg, 0, sizeof(*iseg));
+       iseg->mem_key = cpu_to_be32(rkey);
 }
 
 static __always_inline void set_raddr_seg(struct mlx4_wqe_raddr_seg *rseg,

diff --git a/include/linux/mlx4/qp.h b/include/linux/mlx4/qp.h
index 4b4ad6ffef9289594a47b00ba231d8afb4d69cce..6c8a68c602be10a254963bea4a82245082eb7c0d 100644 (file)
--- a/include/linux/mlx4/qp.h
+++ b/include/linux/mlx4/qp.h
@@ -304,12 +304,10 @@ struct mlx4_wqe_fmr_ext_seg {
 };
 
 struct mlx4_wqe_local_inval_seg {
-       __be32                  flags;
-       u32                     reserved1;
+       u64                     reserved1;
        __be32                  mem_key;
-       u32                     reserved2[2];
-       __be32                  guest_id;
-       __be64                  pa;
+       u32                     reserved2;
+       u64                     reserved3[2];
 };
 
 struct mlx4_wqe_raddr_seg {