---

yaml --- r: 358879 b: refs/heads/master c: 57d88cf h: refs/heads/master i: 358877: 45143a1 358875: 68480db 358871: 1411821 358863: d00bba6 358847: de3ad5d v: v3
git-mirror · Feb 25, 2013 · ab96524 · ab96524
1 parent 311c988
commit ab96524
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;