From 68480db63351c80afc2ed0328eb77831d2f22588 Mon Sep 17 00:00:00 2001
From: Shani Michaeli <shanim@mellanox.com>
Date: Wed, 6 Feb 2013 16:19:07 +0000
Subject: [PATCH] --- yaml --- r: 358875 b: refs/heads/master c:
 aee38fadd25989c3e6d99fc08752e2d87601ffc1 h: refs/heads/master i:   358873:
 94bec7ffb6dc971261ab4da0f9b2bb63560047d2   358871:
 141182116b5442f582414b7914b75f9268e60942 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/infiniband/hw/mlx4/qp.c | 6 ++----
 trunk/include/linux/mlx4/qp.h         | 8 +++-----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 9ee14e008e82..6f12ce828d94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6950a235b86cf4e73d2b8e5476e7d0eb8f61af63
+refs/heads/master: aee38fadd25989c3e6d99fc08752e2d87601ffc1
diff --git a/trunk/drivers/infiniband/hw/mlx4/qp.c b/trunk/drivers/infiniband/hw/mlx4/qp.c
index 19e0637220b9..c6dde71b4642 100644
--- a/trunk/drivers/infiniband/hw/mlx4/qp.c
+++ b/trunk/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/trunk/include/linux/mlx4/qp.h b/trunk/include/linux/mlx4/qp.h
index 4b4ad6ffef92..6c8a68c602be 100644
--- a/trunk/include/linux/mlx4/qp.h
+++ b/trunk/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 {