Skip to contentSkip to conversation

skge: default WOL should be magic only

PATCH In review Stephen Hemminger 2 participants 4 messages May 7, 2007 – May 9, 2007

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Stephen Hemminger

author
#0 lore raw

PATCH 1/2 skge: default WOL should be magic only

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 <[email protected]>a
---
 drivers/net/skge.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/skge.c +1 -1
@@ -3591,7 +3591,7 @@ static struct net_device *skge_devinit(s
 	skge->duplex = -1;
 	skge->speed = -1;
 	skge->advertising = skge_supported_modes(hw);
-	skge->wol = pci_wake_enabled(hw->pdev) ? wol_supported(hw) : 0;
+	skge->wol = pci_wake_enabled(hw->pdev) ? WAKE_MAGIC : 0;
 
 	hw->dev[port] = dev;
#1 lore raw
Quoted 12 lines · Stephen Hemminger

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 <[email protected]>a
---
 drivers/net/skge.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/net/skge.c static struct net_device *skge_devinit(s · line 3594

Quoted 5 lines
drivers/net/skge.c +1 -1
@@ -3591,7 +3591,7 @@ static struct net_device *skge_devinit(s
 	skge->duplex = -1;
 	skge->speed = -1;
 	skge->advertising = skge_supported_modes(hw);
-	skge->wol = pci_wake_enabled(hw->pdev) ? wol_supported(hw) : 0;
+	skge->wol = pci_wake_enabled(hw->pdev) ? WAKE_MAGIC : 0;

NAK. You still need to check for buggy chips (as in patch #2)

If [email protected] applied this, they need to fix it as you will for upstream...

Jeff

author
#2 lore raw

PATCH 1/2 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 <[email protected]>a
---
 drivers/net/skge.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/skge.c +3 -1
@@ -3594,7 +3594,9 @@ static struct net_device *skge_devinit(s
 	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;
#3 lore raw

Re: [PATCH 1/2] skge: default WOL should be magic only (rev2)

Quoted 12 lines · Stephen Hemminger

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 <[email protected]>a
---
 drivers/net/skge.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

drivers/net/skge.c static struct net_device *skge_devinit(s · line 3599

Quoted 7 lines
drivers/net/skge.c +3 -1
@@ -3594,7 +3594,9 @@ static struct net_device *skge_devinit(s
 	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;

thanks for the revision, applied