From e7077f860844a8bfa5c06a56b634149b527a4951 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 7 May 2007 11:01:55 -0700 Subject: [PATCH] --- yaml --- r: 55093 b: refs/heads/master c: d17ecb23b2e5ca174c0f5ce6be42cb3909a02ed0 h: refs/heads/master i: 55091: 6fe1f51e849154fee7aafe8979fd5dba1d08b3a9 v: v3 --- [refs] | 2 +- trunk/drivers/net/skge.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b92ad93c5899..357116664100 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5443e9ead4f53fd7a43e6846cf10fdc0c5366a93 +refs/heads/master: d17ecb23b2e5ca174c0f5ce6be42cb3909a02ed0 diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c index 21afe108d3cb..b07da1054add 100644 --- a/trunk/drivers/net/skge.c +++ b/trunk/drivers/net/skge.c @@ -135,10 +135,13 @@ static void skge_get_regs(struct net_device *dev, struct ethtool_regs *regs, /* Wake on Lan only supported on Yukon chips with rev 1 or above */ static u32 wol_supported(const struct skge_hw *hw) { - if (hw->chip_id == CHIP_ID_YUKON && hw->chip_rev != 0) - return WAKE_MAGIC | WAKE_PHY; - else + if (hw->chip_id == CHIP_ID_GENESIS) return 0; + + if (hw->chip_id == CHIP_ID_YUKON && hw->chip_rev == 0) + return 0; + + return WAKE_MAGIC | WAKE_PHY; } static u32 pci_wake_enabled(struct pci_dev *dev)