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

Commit 559a9f1d authored by Oren Duer's avatar Oren Duer Committed by David S. Miller
Browse files

net/mlx4_en: fix WOL handlers were always looking at port2 capability bit 



There are 2 capability bits for WOL, one for each port.
WOL handlers were looking only on the second bit, regardless of the port.

Signed-off-by: default avatarOren Duer <oren@mellanox.co.il>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f0ab34f0

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

+18 −2
Original line number Diff line number Diff line
@@ -106,8 +106,17 @@ static void mlx4_en_get_wol(struct net_device *netdev, 
	struct mlx4_en_priv *priv = netdev_priv(netdev);

	int err = 0;

	u64 config = 0;

	u64 mask;



	if (!(priv->mdev->dev->caps.flags & MLX4_DEV_CAP_FLAG_WOL)) {

	if ((priv->port < 1) || (priv->port > 2)) {

		en_err(priv, "Failed to get WoL information\n");

		return;

	}



	mask = (priv->port == 1) ? MLX4_DEV_CAP_FLAG_WOL_PORT1 :

		MLX4_DEV_CAP_FLAG_WOL_PORT2;



	if (!(priv->mdev->dev->caps.flags & mask)) {

		wol->supported = 0;

		wol->wolopts = 0;

		return;
@@ -136,8 +145,15 @@ static int mlx4_en_set_wol(struct net_device *netdev, 
	struct mlx4_en_priv *priv = netdev_priv(netdev);

	u64 config = 0;

	int err = 0;

	u64 mask;



	if ((priv->port < 1) || (priv->port > 2))

		return -EOPNOTSUPP;



	mask = (priv->port == 1) ? MLX4_DEV_CAP_FLAG_WOL_PORT1 :

		MLX4_DEV_CAP_FLAG_WOL_PORT2;



	if (!(priv->mdev->dev->caps.flags & MLX4_DEV_CAP_FLAG_WOL))

	if (!(priv->mdev->dev->caps.flags & mask))

		return -EOPNOTSUPP;



	if (wol->supported & ~WAKE_MAGIC)

include/linux/mlx4/device.h

+2 −1
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ enum { 
	MLX4_DEV_CAP_FLAG_IBOE		= 1LL << 30,

	MLX4_DEV_CAP_FLAG_UC_LOOPBACK	= 1LL << 32,

	MLX4_DEV_CAP_FLAG_FCS_KEEP	= 1LL << 34,

	MLX4_DEV_CAP_FLAG_WOL		= 1LL << 38,

	MLX4_DEV_CAP_FLAG_WOL_PORT1	= 1LL << 37,

	MLX4_DEV_CAP_FLAG_WOL_PORT2	= 1LL << 38,

	MLX4_DEV_CAP_FLAG_UDP_RSS	= 1LL << 40,

	MLX4_DEV_CAP_FLAG_VEP_UC_STEER	= 1LL << 41,

	MLX4_DEV_CAP_FLAG_VEP_MC_STEER	= 1LL << 42,