* [PATCH 1/2] skge: default WOL should be magic only
@ 2007-05-07 18:00 Stephen Hemminger
2007-05-08 5:06 ` Jeff Garzik
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Hemminger @ 2007-05-07 18:00 UTC (permalink / raw)
To: Jeff Garzik, netdev, stable
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
---
drivers/net/skge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- sky2-2.6.21.orig/drivers/net/skge.c 2007-05-07 10:01:47.000000000 -0700
+++ sky2-2.6.21/drivers/net/skge.c 2007-05-07 10:03:29.000000000 -0700
@@ -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;
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] skge: default WOL should be magic only
2007-05-07 18:00 [PATCH 1/2] skge: default WOL should be magic only Stephen Hemminger
@ 2007-05-08 5:06 ` Jeff Garzik
2007-05-08 20:36 ` [PATCH 1/2] skge: default WOL should be magic only (rev2) Stephen Hemminger
0 siblings, 1 reply; 4+ messages in thread
From: Jeff Garzik @ 2007-05-08 5:06 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev, stable
Stephen Hemminger wrote:
> 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
>
> ---
> drivers/net/skge.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- sky2-2.6.21.orig/drivers/net/skge.c 2007-05-07 10:01:47.000000000 -0700
> +++ sky2-2.6.21/drivers/net/skge.c 2007-05-07 10:03:29.000000000 -0700
> @@ -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 stable@kernel.org applied this, they need to fix it as you will for
upstream...
Jeff
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] skge: default WOL should be magic only (rev2)
2007-05-08 5:06 ` Jeff Garzik
@ 2007-05-08 20:36 ` Stephen Hemminger
2007-05-09 23:25 ` Jeff Garzik
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Hemminger @ 2007-05-08 20:36 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev, stable
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
---
drivers/net/skge.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- sky2-2.6.21.orig/drivers/net/skge.c 2007-05-08 10:06:39.000000000 -0700
+++ sky2-2.6.21/drivers/net/skge.c 2007-05-08 10:21:51.000000000 -0700
@@ -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;
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] skge: default WOL should be magic only (rev2)
2007-05-08 20:36 ` [PATCH 1/2] skge: default WOL should be magic only (rev2) Stephen Hemminger
@ 2007-05-09 23:25 ` Jeff Garzik
0 siblings, 0 replies; 4+ messages in thread
From: Jeff Garzik @ 2007-05-09 23:25 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev, stable
Stephen Hemminger wrote:
> 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
>
> ---
> drivers/net/skge.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> --- sky2-2.6.21.orig/drivers/net/skge.c 2007-05-08 10:06:39.000000000 -0700
> +++ sky2-2.6.21/drivers/net/skge.c 2007-05-08 10:21:51.000000000 -0700
> @@ -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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-05-09 23:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-07 18:00 [PATCH 1/2] skge: default WOL should be magic only Stephen Hemminger
2007-05-08 5:06 ` Jeff Garzik
2007-05-08 20:36 ` [PATCH 1/2] skge: default WOL should be magic only (rev2) Stephen Hemminger
2007-05-09 23:25 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).