projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d455e5b
12186be
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
author
David S. Miller
<davem@davemloft.net>
Wed, 3 Jun 2009 09:43:41 +0000
(
02:43
-0700)
committer
David S. Miller
<davem@davemloft.net>
Wed, 3 Jun 2009 09:43:41 +0000
(
02:43
-0700)
Conflicts:
drivers/net/forcedeth.c
20 files changed:
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/3c509.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/atl1e/atl1e_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/atlx/atl1.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/bfin_mac.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/cxgb3/adapter.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/cxgb3/cxgb3_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/cxgb3/sge.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/cxgb3/t3_hw.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/e1000/e1000_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/forcedeth.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/gianfar.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/mac8390.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/mlx4/en_tx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/r8169.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/at76c50x-usb.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/rtl818x/rtl8187_dev.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sched/cls_cgroup.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/net/3c509.c
Simple merge
diff --cc
drivers/net/Makefile
Simple merge
diff --cc
drivers/net/atl1e/atl1e_main.c
Simple merge
diff --cc
drivers/net/atlx/atl1.c
Simple merge
diff --cc
drivers/net/bfin_mac.c
Simple merge
diff --cc
drivers/net/cxgb3/adapter.h
Simple merge
diff --cc
drivers/net/cxgb3/cxgb3_main.c
Simple merge
diff --cc
drivers/net/cxgb3/sge.c
Simple merge
diff --cc
drivers/net/cxgb3/t3_hw.c
Simple merge
diff --cc
drivers/net/e1000/e1000_main.c
Simple merge
diff --cc
drivers/net/forcedeth.c
index
d0b1d9f
,
9f6a68f
..
1dce555
---
1
/
drivers/net/forcedeth.c
---
2
/
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 {
diff --cc
drivers/net/gianfar.h
Simple merge
diff --cc
drivers/net/mac8390.c
Simple merge
diff --cc
drivers/net/mlx4/en_tx.c
Simple merge
diff --cc
drivers/net/r8169.c
Simple merge
diff --cc
drivers/net/wireless/Kconfig
Simple merge
diff --cc
drivers/net/wireless/at76c50x-usb.c
Simple merge
diff --cc
drivers/net/wireless/rtl818x/rtl8187_dev.c
Simple merge
diff --cc
net/sched/cls_cgroup.c
Simple merge