diff options
| author |   Stephen Hemminger <shemminger@linux-foundation.org> | 2007-05-08 13:36:20 -0700 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2007-05-09 19:25:15 -0400 |
| commit | 5b982c5bb7db5cfbc15236d9d45cec32e5472ed5 (patch) | |
| tree | fb700a17cc01b682694f20fb962b0b1ff0866bdd /drivers/net/skge.c | |
| parent | Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream (diff) | |
| download | linux-dev-5b982c5bb7db5cfbc15236d9d45cec32e5472ed5.tar.xz linux-dev-5b982c5bb7db5cfbc15236d9d45cec32e5472ed5.zip | |
skge: default WOL should be magic only (rev2)
By default, the skge driver now enables wake on magic and wake on PHY.
This is a bad default (bug), wake on PHY means machine will never shutdown
if connected to a switch.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>a
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/skge.c')
| -rw-r--r-- | drivers/net/skge.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index b07da1054add..e0489578945d 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c @@ -3594,7 +3594,9 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port, skge->duplex = -1; skge->speed = -1; skge->advertising = skge_supported_modes(hw); - skge->wol = pci_wake_enabled(hw->pdev) ? wol_supported(hw) : 0; + + if (pci_wake_enabled(hw->pdev)) + skge->wol = wol_supported(hw) & WAKE_MAGIC; hw->dev[port] = dev; |