projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iwl3945: use iwl_get_hw_mode
[deliverable/linux.git]
/
drivers
/
net
/
mv643xx_eth.c
diff --git
a/drivers/net/mv643xx_eth.c
b/drivers/net/mv643xx_eth.c
index 7253a499d9c86f3ec9832c3b0190fff6d0c0e24d..8fab31f631a0e933183c114dd3cfa2a742b06e67 100644
(file)
--- a/
drivers/net/mv643xx_eth.c
+++ b/
drivers/net/mv643xx_eth.c
@@
-136,21
+136,23
@@
static char mv643xx_eth_driver_version[] = "1.4";
/*
* SDMA configuration register.
*/
/*
* SDMA configuration register.
*/
+#define RX_BURST_SIZE_4_64BIT (2 << 1)
#define RX_BURST_SIZE_16_64BIT (4 << 1)
#define BLM_RX_NO_SWAP (1 << 4)
#define BLM_TX_NO_SWAP (1 << 5)
#define RX_BURST_SIZE_16_64BIT (4 << 1)
#define BLM_RX_NO_SWAP (1 << 4)
#define BLM_TX_NO_SWAP (1 << 5)
+#define TX_BURST_SIZE_4_64BIT (2 << 22)
#define TX_BURST_SIZE_16_64BIT (4 << 22)
#if defined(__BIG_ENDIAN)
#define PORT_SDMA_CONFIG_DEFAULT_VALUE \
#define TX_BURST_SIZE_16_64BIT (4 << 22)
#if defined(__BIG_ENDIAN)
#define PORT_SDMA_CONFIG_DEFAULT_VALUE \
- (RX_BURST_SIZE_
16_64BIT
| \
-
TX_BURST_SIZE_16
_64BIT)
+ (RX_BURST_SIZE_
4_64BIT
| \
+
TX_BURST_SIZE_4
_64BIT)
#elif defined(__LITTLE_ENDIAN)
#define PORT_SDMA_CONFIG_DEFAULT_VALUE \
#elif defined(__LITTLE_ENDIAN)
#define PORT_SDMA_CONFIG_DEFAULT_VALUE \
- (RX_BURST_SIZE_
16_64BIT
| \
-
BLM_RX_NO_SWAP
| \
-
BLM_TX_NO_SWAP
| \
-
TX_BURST_SIZE_16
_64BIT)
+ (RX_BURST_SIZE_
4_64BIT
| \
+
BLM_RX_NO_SWAP
| \
+
BLM_TX_NO_SWAP
| \
+
TX_BURST_SIZE_4
_64BIT)
#else
#error One of __BIG_ENDIAN or __LITTLE_ENDIAN must be defined
#endif
#else
#error One of __BIG_ENDIAN or __LITTLE_ENDIAN must be defined
#endif
@@
-1594,7
+1596,7
@@
oom:
entry = addr_crc(a);
}
entry = addr_crc(a);
}
- table[entry >> 2] |= 1 << (
entry & 3
);
+ table[entry >> 2] |= 1 << (
8 * (entry & 3)
);
}
for (i = 0; i < 0x100; i += 4) {
}
for (i = 0; i < 0x100; i += 4) {
@@
-2210,6
+2212,7
@@
static int mv643xx_eth_stop(struct net_device *dev)
struct mv643xx_eth_private *mp = netdev_priv(dev);
int i;
struct mv643xx_eth_private *mp = netdev_priv(dev);
int i;
+ wrlp(mp, INT_MASK_EXT, 0x00000000);
wrlp(mp, INT_MASK, 0x00000000);
rdlp(mp, INT_MASK);
wrlp(mp, INT_MASK, 0x00000000);
rdlp(mp, INT_MASK);
@@
-2586,7
+2589,7
@@
static void phy_init(struct mv643xx_eth_private *mp, int speed, int duplex)
phy_reset(mp);
phy_reset(mp);
- phy_attach(mp->dev,
phy->dev.bus_id
, 0, PHY_INTERFACE_MODE_GMII);
+ phy_attach(mp->dev,
dev_name(&phy->dev)
, 0, PHY_INTERFACE_MODE_GMII);
if (speed == 0) {
phy->autoneg = AUTONEG_ENABLE;
if (speed == 0) {
phy->autoneg = AUTONEG_ENABLE;
This page took
0.025387 seconds
and
5
git commands to generate.