git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
net
/
sh_eth.c
diff --git
a/drivers/net/sh_eth.c
b/drivers/net/sh_eth.c
index
8a72a97
..
1f3f7b4
100644
(file)
--- a/
drivers/net/sh_eth.c
+++ b/
drivers/net/sh_eth.c
@@
-140,6
+140,8
@@
static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
.tpauser = 1,
.hw_swap = 1,
.no_ade = 1,
.tpauser = 1,
.hw_swap = 1,
.no_ade = 1,
+ .rpadir = 1,
+ .rpadir_value = 2 << 16,
};
#define SH_GIGA_ETH_BASE 0xfee00000
};
#define SH_GIGA_ETH_BASE 0xfee00000
@@
-1184,8
+1186,8
@@
static void sh_eth_adjust_link(struct net_device *ndev)
mdp->cd->set_rate(ndev);
}
if (mdp->link == PHY_DOWN) {
mdp->cd->set_rate(ndev);
}
if (mdp->link == PHY_DOWN) {
- sh_eth_write(ndev,
(sh_eth_read(ndev, ECMR) & ~ECMR_TXF)
-
| ECMR_DM
, ECMR);
+ sh_eth_write(ndev,
+
(sh_eth_read(ndev, ECMR) & ~ECMR_TXF)
, ECMR);
new_state = 1;
mdp->link = phydev->link;
}
new_state = 1;
mdp->link = phydev->link;
}