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;