The patch titled
forcedeth config: wol
has been removed from the -mm tree. Its filename is
forcedeth-config-wol.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: forcedeth config: wol
From: Ayaz Abdulla <aabdulla@xxxxxxxxxx>
This patch fixes configuration bugs when modifying wol settings.
Signed-off-by: Ayaz Abdulla <aabdulla@xxxxxxxxxx>
Cc: Manfred Spraul <manfred@xxxxxxxxxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/forcedeth.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff -puN drivers/net/forcedeth.c~forcedeth-config-wol drivers/net/forcedeth.c
--- devel/drivers/net/forcedeth.c~forcedeth-config-wol 2006-06-09 15:21:18.000000000 -0700
+++ devel-akpm/drivers/net/forcedeth.c 2006-06-09 15:21:18.000000000 -0700
@@ -2492,17 +2492,19 @@ static int nv_set_wol(struct net_device
{
struct fe_priv *np = netdev_priv(dev);
u8 __iomem *base = get_hwbase(dev);
+ u32 flags = 0;
- spin_lock_irq(&np->lock);
if (wolinfo->wolopts == 0) {
- writel(0, base + NvRegWakeUpFlags);
np->wolenabled = 0;
- }
- if (wolinfo->wolopts & WAKE_MAGIC) {
- writel(NVREG_WAKEUPFLAGS_ENABLE, base + NvRegWakeUpFlags);
+ } else if (wolinfo->wolopts & WAKE_MAGIC) {
np->wolenabled = 1;
+ flags = NVREG_WAKEUPFLAGS_ENABLE;
+ }
+ if (netif_running(dev)) {
+ spin_lock_irq(&np->lock);
+ writel(flags, base + NvRegWakeUpFlags);
+ spin_unlock_irq(&np->lock);
}
- spin_unlock_irq(&np->lock);
return 0;
}
@@ -3288,7 +3290,8 @@ static int nv_open(struct net_device *de
base + NvRegAdapterControl);
writel(NVREG_MIISPEED_BIT8|NVREG_MIIDELAY, base + NvRegMIISpeed);
writel(NVREG_UNKSETUP4_VAL, base + NvRegUnknownSetupReg4);
- writel(NVREG_WAKEUPFLAGS_VAL, base + NvRegWakeUpFlags);
+ if (np->wolenabled)
+ writel(NVREG_WAKEUPFLAGS_ENABLE , base + NvRegWakeUpFlags);
i = readl(base + NvRegPowerState);
if ( (i & NVREG_POWERSTATE_POWEREDUP) == 0)
_
Patches currently in -mm which might be from aabdulla@xxxxxxxxxx are
git-netdev-all.patch
forcedeth-typecast-cleanup.patch
lock-validator-forcedethc-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
