Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e18f6ac3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlx4-fixes' 



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: default avatarDavid S. Miller <davem@davemloft.net>
parents e407f39a c02b0501

drivers/net/ethernet/mellanox/mlx4/cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/mellanox/mlx4/en_tx.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/mellanox/mlx4/eq.c

+1 −1
Original line number Diff line number Diff line
@@ -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();