---

yaml --- r: 55093 b: refs/heads/master c: d17ecb2 h: refs/heads/master i: 55091: 6fe1f51 v: v3
git-mirror · May 8, 2007 · e7077f8 · e7077f8
1 parent d2eb8ec
commit e7077f8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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)