diff options
| author |   Alan Cox <alan@linux.intel.com> | 2009-08-27 10:59:56 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:27 -0700 |
| commit | c2557177f16cc0b63115a1ea09c732e3ace14d5f (patch) | |
| tree | 96e2dab57f53ae1fe06c37d76c87b795edb55a67 /drivers/staging/et131x/et1310_tx.c | |
| parent | Staging: et131x: eliminate write only registry fields (diff) | |
| download | linux-dev-c2557177f16cc0b63115a1ea09c732e3ace14d5f.tar.xz linux-dev-c2557177f16cc0b63115a1ea09c732e3ace14d5f.zip | |
Staging: et131x: clean up constant rx/tx registry fields
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et1310_tx.c')
| -rw-r--r-- | drivers/staging/et131x/et1310_tx.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/staging/et131x/et1310_tx.c b/drivers/staging/et131x/et1310_tx.c index 8e8486adda39..8472c1b33f33 100644 --- a/drivers/staging/et131x/et1310_tx.c +++ b/drivers/staging/et131x/et1310_tx.c @@ -94,6 +94,7 @@ #include "et1310_tx.h" + /* Data for debugging facilities */ #ifdef CONFIG_ET131X_DEBUG extern dbg_info_t *et131x_dbginfo; @@ -711,7 +712,7 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb) if (etdev->uiLinkSpeed == TRUEPHY_SPEED_1000MBPS) { if (++etdev->TxRing.TxPacketsSinceLastinterrupt == - etdev->RegistryTxNumBuffers) { + PARM_TX_NUM_BUFS_DEF) { CurDesc[FragmentNumber - 1].word3.value = 0x5; etdev->TxRing.TxPacketsSinceLastinterrupt = 0; } else { @@ -794,7 +795,7 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb) * timer to wake us up if this packet isn't followed by N more. */ if (etdev->uiLinkSpeed == TRUEPHY_SPEED_1000MBPS) { - writel(etdev->RegistryTxTimeInterval * NANO_IN_A_MICRO, + writel(PARM_TX_TIME_INT_DEF * NANO_IN_A_MICRO, &etdev->regs->global.watchdog_timer); } @@ -1064,7 +1065,7 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb) TRUEPHY_SPEED_1000MBPS) { if (++etdev->TxRing. TxPacketsSinceLastinterrupt >= - etdev->RegistryTxNumBuffers) { + PARM_TX_NUM_BUFS_DEF) { CurDesc.word3.value = 0x5; etdev->TxRing. TxPacketsSinceLastinterrupt @@ -1132,7 +1133,7 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb) if (etdev->uiLinkSpeed == TRUEPHY_SPEED_1000MBPS) { if (++etdev->TxRing.TxPacketsSinceLastinterrupt >= - etdev->RegistryTxNumBuffers) { + PARM_TX_NUM_BUFS_DEF) { CurDesc.word3.value = 0x5; etdev->TxRing.TxPacketsSinceLastinterrupt = 0; @@ -1212,7 +1213,7 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb) * timer to wake us up if this packet isn't followed by N more. */ if (etdev->uiLinkSpeed == TRUEPHY_SPEED_1000MBPS) { - writel(etdev->RegistryTxTimeInterval * NANO_IN_A_MICRO, + writel(PARM_TX_TIME_INT_DEF * NANO_IN_A_MICRO, &etdev->regs->global.watchdog_timer); } |