aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/mv643xx_eth.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
-rw-r--r--drivers/net/mv643xx_eth.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 3211369a4320..207d4391a6de 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -154,7 +154,6 @@ static char mv643xx_eth_driver_version[] = "1.1";
154#define SET_MII_SPEED_TO_100 (1 << 24) 154#define SET_MII_SPEED_TO_100 (1 << 24)
155#define SET_GMII_SPEED_TO_1000 (1 << 23) 155#define SET_GMII_SPEED_TO_1000 (1 << 23)
156#define SET_FULL_DUPLEX_MODE (1 << 21) 156#define SET_FULL_DUPLEX_MODE (1 << 21)
157#define MAX_RX_PACKET_1522BYTE (1 << 17)
158#define MAX_RX_PACKET_9700BYTE (5 << 17) 157#define MAX_RX_PACKET_9700BYTE (5 << 17)
159#define MAX_RX_PACKET_MASK (7 << 17) 158#define MAX_RX_PACKET_MASK (7 << 17)
160#define DISABLE_AUTO_NEG_SPEED_GMII (1 << 13) 159#define DISABLE_AUTO_NEG_SPEED_GMII (1 << 13)
@@ -1674,13 +1673,12 @@ static void update_pscr(struct mv643xx_eth_private *mp, int speed, int duplex)
1674 SET_FULL_DUPLEX_MODE | 1673 SET_FULL_DUPLEX_MODE |
1675 MAX_RX_PACKET_MASK); 1674 MAX_RX_PACKET_MASK);
1676 1675
1677 if (speed == SPEED_1000) { 1676 pscr_n |= MAX_RX_PACKET_9700BYTE;
1678 pscr_n |= SET_GMII_SPEED_TO_1000 | MAX_RX_PACKET_9700BYTE; 1677
1679 } else { 1678 if (speed == SPEED_1000)
1680 if (speed == SPEED_100) 1679 pscr_n |= SET_GMII_SPEED_TO_1000;
1681 pscr_n |= SET_MII_SPEED_TO_100; 1680 else if (speed == SPEED_100)
1682 pscr_n |= MAX_RX_PACKET_1522BYTE; 1681 pscr_n |= SET_MII_SPEED_TO_100;
1683 }
1684 1682
1685 if (duplex == DUPLEX_FULL) 1683 if (duplex == DUPLEX_FULL)
1686 pscr_n |= SET_FULL_DUPLEX_MODE; 1684 pscr_n |= SET_FULL_DUPLEX_MODE;