Merge branch 'mlx4-fixes'

davem330 · davem330 · commit e18f6ac30d31 · 2015-10-27T20:27:45.000-07:00
Or Gerlitz says:

====================
Mellanox mlx4 driver fixes for 4.3-rc7

Jack's fix is for a regression introduced in 4.3-rc1

Carol's fix addresses an issue which exists for while and
turns to beat us hard on PPC, please queue for -stable.
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -2398,7 +2398,7 @@ int mlx4_multi_func_init(struct mlx4_dev *dev)
 			}
 		}
 
-		memset(&priv->mfunc.master.cmd_eqe, 0, dev->caps.eqe_size);
+		memset(&priv->mfunc.master.cmd_eqe, 0, sizeof(struct mlx4_eqe));
 		priv->mfunc.master.cmd_eqe.type = MLX4_EVENT_TYPE_CMD;
 		INIT_WORK(&priv->mfunc.master.comm_work,
 			  mlx4_master_comm_channel);
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -964,6 +964,8 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
 			tx_desc->ctrl.ins_vlan = MLX4_WQE_CTRL_INS_SVLAN;
 		else if (vlan_proto == ETH_P_8021Q)
 			tx_desc->ctrl.ins_vlan = MLX4_WQE_CTRL_INS_CVLAN;
+		else
+			tx_desc->ctrl.ins_vlan = 0;
 
 		tx_desc->ctrl.fence_size = real_size;
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -196,7 +196,7 @@ static void slave_event(struct mlx4_dev *dev, u8 slave, struct mlx4_eqe *eqe)
 		return;
 	}
 
-	memcpy(s_eqe, eqe, dev->caps.eqe_size - 1);
+	memcpy(s_eqe, eqe, sizeof(struct mlx4_eqe) - 1);
 	s_eqe->slave_id = slave;
 	/* ensure all information is written before setting the ownersip bit */
 	dma_wmb();

Original file line number	Diff line number	Diff line change
`@@ -2398,7 +2398,7 @@ int mlx4_multi_func_init(struct mlx4_dev *dev)`
`2398`	`2398`	`}`
`2399`	`2399`	`}`
`2400`	`2400`
`2401`		`- memset(&priv->mfunc.master.cmd_eqe, 0, dev->caps.eqe_size);`
	`2401`	`+ memset(&priv->mfunc.master.cmd_eqe, 0, sizeof(struct mlx4_eqe));`
`2402`	`2402`	`priv->mfunc.master.cmd_eqe.type = MLX4_EVENT_TYPE_CMD;`
`2403`	`2403`	`INIT_WORK(&priv->mfunc.master.comm_work,`
`2404`	`2404`	`mlx4_master_comm_channel);`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ static void slave_event(struct mlx4_dev dev, u8 slave, struct mlx4_eqe eqe)`
`196`	`196`	`return;`
`197`	`197`	`}`
`198`	`198`
`199`		`- memcpy(s_eqe, eqe, dev->caps.eqe_size - 1);`
	`199`	`+ memcpy(s_eqe, eqe, sizeof(struct mlx4_eqe) - 1);`
`200`	`200`	`s_eqe->slave_id = slave;`
`201`	`201`	`/* ensure all information is written before setting the ownersip bit */`
`202`	`202`	`dma_wmb();`