summaryrefslogtreecommitdiff
path: root/drivers/net/8139too.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-04-23 15:08:24 +0400
committerDavid S. Miller <davem@davemloft.net>2009-04-23 15:08:24 +0400
commit5802b140ed52957ad150eaf40239a95f5f45fbd3 (patch)
treee5c37962611bc5f39c56a1ec479b9059072f056a /drivers/net/8139too.c
parent09488e2e0fab14ebe41135f0d066cfe2c56ba9e5 (diff)
parent29fe1b481283a1bada994a69f65736db4ae6f35f (diff)
downloadlinux-5802b140ed52957ad150eaf40239a95f5f45fbd3.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/iucv/af_iucv.c
Diffstat (limited to 'drivers/net/8139too.c')
-rw-r--r--drivers/net/8139too.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 00fe1301a9c4..d90177509bf6 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -1383,6 +1383,11 @@ static void rtl8139_hw_start (struct net_device *dev)
RTL_W32_F (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));
RTL_W32_F (MAC0 + 4, le16_to_cpu (*(__le16 *) (dev->dev_addr + 4)));
+ tp->cur_rx = 0;
+
+ /* init Rx ring buffer DMA address */
+ RTL_W32_F (RxBuf, tp->rx_ring_dma);
+
/* Must enable Tx/Rx before setting transfer thresholds! */
RTL_W8 (ChipCmd, CmdRxEnb | CmdTxEnb);
@@ -1390,8 +1395,6 @@ static void rtl8139_hw_start (struct net_device *dev)
RTL_W32 (RxConfig, tp->rx_config);
RTL_W32 (TxConfig, rtl8139_tx_config);
- tp->cur_rx = 0;
-
rtl_check_media (dev, 1);
if (tp->chipset >= CH_8139B) {
@@ -1406,9 +1409,6 @@ static void rtl8139_hw_start (struct net_device *dev)
/* Lock Config[01234] and BMCR register writes */
RTL_W8 (Cfg9346, Cfg9346_Lock);
- /* init Rx ring buffer DMA address */
- RTL_W32_F (RxBuf, tp->rx_ring_dma);
-
/* init Tx buffer DMA addresses */
for (i = 0; i < NUM_TX_DESC; i++)
RTL_W32_F (TxAddr0 + (i * 4), tp->tx_bufs_dma + (tp->tx_buf[i] - tp->tx_bufs));