From: David S. Miller <davem@davemloft.net>
Date: Wed, 3 Jun 2009 09:43:41 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/forcedeth.c
---

b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768
diff --cc drivers/net/forcedeth.c
index d0b1d9f17a5d,9f6a68fb7b45..1dce5550f553
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@@ -5534,8 -5522,7 +5543,8 @@@ static int nv_close(struct net_device *
  
  	nv_drain_rxtx(dev);
  
- 	if (np->wolenabled) {
+ 	if (np->wolenabled || !phy_power_down) {
 +		nv_txrx_gate(dev, false);
  		writel(NVREG_PFF_ALWAYS|NVREG_PFF_MYADDR, base + NvRegPacketFilterFlags);
  		nv_start_rx(dev);
  	} else {