Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Wed, 3 Jun 2009 09:43:41 +0000 (02:43 -0700)]
Conflicts:
drivers/net/forcedeth.c

20 files changed:
1  2 
MAINTAINERS
drivers/net/3c509.c
drivers/net/Makefile
drivers/net/atl1e/atl1e_main.c
drivers/net/atlx/atl1.c
drivers/net/bfin_mac.c
drivers/net/cxgb3/adapter.h
drivers/net/cxgb3/cxgb3_main.c
drivers/net/cxgb3/sge.c
drivers/net/cxgb3/t3_hw.c
drivers/net/e1000/e1000_main.c
drivers/net/forcedeth.c
drivers/net/gianfar.h
drivers/net/mac8390.c
drivers/net/mlx4/en_tx.c
drivers/net/r8169.c
drivers/net/wireless/Kconfig
drivers/net/wireless/at76c50x-usb.c
drivers/net/wireless/rtl818x/rtl8187_dev.c
net/sched/cls_cgroup.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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 {
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge