[kernel] r11365 - in dists/trunk/linux-2.6/debian/patches: features/all series

[Maximilian Attems]

Author: maks
Date: Sun May 11 22:04:57 2008
New Revision: 11365

Log:
net add atl1 shutdown callback patch

fixes wol, 2.6.27 target


Added:
   dists/trunk/linux-2.6/debian/patches/features/all/drivers-net-atl1-shutdown-callback.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Added: dists/trunk/linux-2.6/debian/patches/features/all/drivers-net-atl1-shutdown-callback.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/features/all/drivers-net-atl1-shutdown-callback.patch	Sun May 11 22:04:57 2008
@@ -0,0 +1,63 @@
+From: Jay Cliburn <jacliburn at bellsouth.net>
+To: jeff at garzik.org
+Cc: netdev at vger.kernel.org, linux-kernel at vger.kernel.org,
+	csnook at redhat.com, pelle at dsv.su.se,
+	Jay Cliburn <jacliburn at bellsouth.net>
+Subject: [PATCH 3/4] atl1: add shutdown callback
+Date:	Fri,  9 May 2008 22:12:08 -0500
+Message-Id: <1210389129-3868-4-git-send-email-jacliburn at bellsouth.net>
+X-Mailer: git-send-email 1.5.4.1
+In-Reply-To: <1210389129-3868-1-git-send-email-jacliburn at bellsouth.net>
+References: <1210389129-3868-1-git-send-email-jacliburn at bellsouth.net>
+Sender: netdev-owner at vger.kernel.org
+Precedence: bulk
+List-ID: <netdev.vger.kernel.org>
+X-Mailing-List:	netdev at vger.kernel.org
+
+Add a shutdown callback that points to atl1_suspend().  This, along
+with a working suspend function, fixes wake-on-lan.
+
+Tested-by: Per Olofsson <pelle at dsv.su.se>
+Signed-off-by: Jay Cliburn <jacliburn at bellsouth.net>
+---
+ drivers/net/atlx/atl1.c |   11 +++++++++--
+ 1 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
+index 12fb3e5..b7092a3 100644
+--- a/drivers/net/atlx/atl1.c
++++ b/drivers/net/atlx/atl1.c
+@@ -36,7 +36,6 @@
+  * A very incomplete list of things that need to be dealt with:
+  *
+  * TODO:
+- * Wake on LAN.
+  * Add more ethtool functions.
+  * Fix abstruse irq enable/disable condition described here:
+  *	http://marc.theaimsgroup.com/?l=linux-netdev&m=116398508500553&w=2
+@@ -2908,6 +2907,13 @@ static int atl1_resume(struct pci_dev *pdev)
+ #define atl1_resume NULL
+ #endif
+ 
++static void atl1_shutdown(struct pci_dev *pdev)
++{
++#ifdef CONFIG_PM
++	atl1_suspend(pdev, PMSG_SUSPEND);
++#endif
++}
++
+ #ifdef CONFIG_NET_POLL_CONTROLLER
+ static void atl1_poll_controller(struct net_device *netdev)
+ {
+@@ -3154,7 +3160,8 @@ static struct pci_driver atl1_driver = {
+ 	.probe = atl1_probe,
+ 	.remove = __devexit_p(atl1_remove),
+ 	.suspend = atl1_suspend,
+-	.resume = atl1_resume
++	.resume = atl1_resume,
++	.shutdown = atl1_shutdown
+ };
+ 
+ /*
+-- 
+1.5.4.1

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Sun May 11 22:04:57 2008
@@ -33,6 +33,7 @@
 + features/arm/5281d0.patch
 + features/all/drivers-net-atl1-PHY-power-save-mode.patch
 + features/all/drivers-net-atl1-suspend-resume.patch
++ features/all/drivers-net-atl1-shutdown-callback.patch
 + features/all/at76.patch 
 + bugfix/fix-hifn_795X-divdi3.patch
 + bugfix/all/mtd-prevent-physmap-from-causing-request_module-runaway-loop-modprobe-net-pf-1.patch