Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765801AbXEUTZZ (ORCPT ); Mon, 21 May 2007 15:25:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1765340AbXEUTV1 (ORCPT ); Mon, 21 May 2007 15:21:27 -0400 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:46325 "EHLO sous-sol.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1765301AbXEUTVT (ORCPT ); Mon, 21 May 2007 15:21:19 -0400 Message-Id: <20070521191715.934272000@sous-sol.org> References: <20070521191612.800400000@sous-sol.org> User-Agent: quilt/0.46-1 Date: Mon, 21 May 2007 12:16:31 -0700 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org, Jeff Garzik Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Stephen Hemminger Subject: [patch 19/69] skge: default WOL should be magic only (rev2) Content-Disposition: inline; filename=skge-default-wol-should-be-magic-only.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1190 Lines: 36 -stable review patch. If anyone has any objections, please let us know. --------------------- From: 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 Signed-off-by: Chris Wright --- drivers/net/skge.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- linux-2.6.21.1.orig/drivers/net/skge.c +++ linux-2.6.21.1/drivers/net/skge.c @@ -3583,7 +3583,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; -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/