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

Commit 3b259e36 authored by J. K. Cliburn's avatar J. K. Cliburn Committed by Jeff Garzik
Browse files

atl1: Do not enumerate options unsupported by chip 



Of the various WOL options provided in include/linux/ethtool.h, the
L1 NIC supports only magic packet.  Remove all options except magic
packet from the atl1 driver.

Signed-off-by: default avatarJay Cliburn <jcliburn@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 7ee0fddf

drivers/net/atlx/atl1.c

+3 −14
Original line number Diff line number Diff line
@@ -3404,14 +3404,8 @@ static void atl1_get_wol(struct net_device *netdev, 
{

	struct atl1_adapter *adapter = netdev_priv(netdev);



	wol->supported = WAKE_UCAST | WAKE_MCAST | WAKE_BCAST | WAKE_MAGIC;

	wol->supported = WAKE_MAGIC;

	wol->wolopts = 0;

	if (adapter->wol & ATLX_WUFC_EX)

		wol->wolopts |= WAKE_UCAST;

	if (adapter->wol & ATLX_WUFC_MC)

		wol->wolopts |= WAKE_MCAST;

	if (adapter->wol & ATLX_WUFC_BC)

		wol->wolopts |= WAKE_BCAST;

	if (adapter->wol & ATLX_WUFC_MAG)

		wol->wolopts |= WAKE_MAGIC;

	return;
@@ -3422,15 +3416,10 @@ static int atl1_set_wol(struct net_device *netdev, 
{

	struct atl1_adapter *adapter = netdev_priv(netdev);



	if (wol->wolopts & (WAKE_PHY | WAKE_ARP | WAKE_MAGICSECURE))

	if (wol->wolopts & (WAKE_PHY | WAKE_UCAST | WAKE_MCAST | WAKE_BCAST |

		WAKE_ARP | WAKE_MAGICSECURE))

		return -EOPNOTSUPP;

	adapter->wol = 0;

	if (wol->wolopts & WAKE_UCAST)

		adapter->wol |= ATLX_WUFC_EX;

	if (wol->wolopts & WAKE_MCAST)

		adapter->wol |= ATLX_WUFC_MC;

	if (wol->wolopts & WAKE_BCAST)

		adapter->wol |= ATLX_WUFC_BC;

	if (wol->wolopts & WAKE_MAGIC)

		adapter->wol |= ATLX_WUFC_MAG;

	return 0;