From ab96524c74f82f5e241c13934a4a7d399e0936fd Mon Sep 17 00:00:00 2001
From: Paul Bolle <pebolle@tiscali.nl>
Date: Mon, 25 Feb 2013 09:17:13 -0800
Subject: [PATCH] --- yaml --- r: 358879 b: refs/heads/master c:
 57d88cffc83a2120266bbe9e72cbba5bd5f33675 h: refs/heads/master i:   358877:
 45143a1144d76a33623571c8db5702e0ec781733   358875:
 68480db63351c80afc2ed0328eb77831d2f22588   358871:
 141182116b5442f582414b7914b75f9268e60942   358863:
 d00bba61751608cbe1fdaa2e7f6a27729bdbf455   358847:
 de3ad5dbcec85345d83af39ce075a1098a2d80a8 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/infiniband/hw/mlx4/qp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 773dc2788ee9..077de3926cc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a29bec12412d0e6f18ef1ce5f535e39829038648
+refs/heads/master: 57d88cffc83a2120266bbe9e72cbba5bd5f33675
diff --git a/trunk/drivers/infiniband/hw/mlx4/qp.c b/trunk/drivers/infiniband/hw/mlx4/qp.c
index f8ac5333504d..ebadebe83b11 100644
--- a/trunk/drivers/infiniband/hw/mlx4/qp.c
+++ b/trunk/drivers/infiniband/hw/mlx4/qp.c
@@ -1747,7 +1747,7 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr,
 	int spc;
 	int i;
 	int err = 0;
-	u16 vlan;
+	u16 vlan = 0xffff;
 	bool is_eth;
 	bool is_vlan = false;
 	bool is_grh;