tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Jay Cliburn <jcliburn@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

authored by J. K. Cliburn and committed by Jeff Garzik 3b259e36 7ee0fddf

+3 -14
unified split
+3 -14
drivers/net/atlx/atl1.c
··· 3404 { 3405 struct atl1_adapter *adapter = netdev_priv(netdev); 3406 3407 - wol->supported = WAKE_UCAST | WAKE_MCAST | WAKE_BCAST | WAKE_MAGIC; 3408 wol->wolopts = 0; 3409 - if (adapter->wol & ATLX_WUFC_EX) 3410 - wol->wolopts |= WAKE_UCAST; 3411 - if (adapter->wol & ATLX_WUFC_MC) 3412 - wol->wolopts |= WAKE_MCAST; 3413 - if (adapter->wol & ATLX_WUFC_BC) 3414 - wol->wolopts |= WAKE_BCAST; 3415 if (adapter->wol & ATLX_WUFC_MAG) 3416 wol->wolopts |= WAKE_MAGIC; 3417 return; ··· 3416 { 3417 struct atl1_adapter *adapter = netdev_priv(netdev); 3418 3419 - if (wol->wolopts & (WAKE_PHY | WAKE_ARP | WAKE_MAGICSECURE)) 3420 return -EOPNOTSUPP; 3421 adapter->wol = 0; 3422 - if (wol->wolopts & WAKE_UCAST) 3423 - adapter->wol |= ATLX_WUFC_EX; 3424 - if (wol->wolopts & WAKE_MCAST) 3425 - adapter->wol |= ATLX_WUFC_MC; 3426 - if (wol->wolopts & WAKE_BCAST) 3427 - adapter->wol |= ATLX_WUFC_BC; 3428 if (wol->wolopts & WAKE_MAGIC) 3429 adapter->wol |= ATLX_WUFC_MAG; 3430 return 0;
··· 3404 { 3405 struct atl1_adapter *adapter = netdev_priv(netdev); 3406 3407 + wol->supported = WAKE_MAGIC; 3408 wol->wolopts = 0; 3409 if (adapter->wol & ATLX_WUFC_MAG) 3410 wol->wolopts |= WAKE_MAGIC; 3411 return; ··· 3422 { 3423 struct atl1_adapter *adapter = netdev_priv(netdev); 3424 3425 + if (wol->wolopts & (WAKE_PHY | WAKE_UCAST | WAKE_MCAST | WAKE_BCAST | 3426 + WAKE_ARP | WAKE_MAGICSECURE)) 3427 return -EOPNOTSUPP; 3428 adapter->wol = 0; 3429 if (wol->wolopts & WAKE_MAGIC) 3430 adapter->wol |= ATLX_WUFC_MAG; 3431 return 0;