diff options
author | Alan Cox <alan@linux.intel.com> | 2011-02-01 10:41:45 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-04 16:01:00 -0500 |
commit | ae3a08aab5e0700d3f80162bed07a2157bd304f4 (patch) | |
tree | 6fb5f248647a7466020b71f67e0fc1c452ac3bc3 /drivers/staging/et131x/et1310_tx.c | |
parent | 072e9f609cd6d144b64da50b03b712d87b302e12 (diff) |
staging: et131x: Kill of the eFLOW_CONTROL enum
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/et131x/et1310_tx.c b/drivers/staging/et131x/et1310_tx.c index 0f3473d758e..4241d2afecc 100644 --- a/drivers/staging/et131x/et1310_tx.c +++ b/drivers/staging/et131x/et1310_tx.c | |||
@@ -547,7 +547,7 @@ static int nic_send_packet(struct et131x_adapter *etdev, struct tcb *tcb) | |||
547 | tcb->index_start = etdev->tx_ring.send_idx; | 547 | tcb->index_start = etdev->tx_ring.send_idx; |
548 | tcb->stale = 0; | 548 | tcb->stale = 0; |
549 | 549 | ||
550 | spin_lock_irqsave(&etdev->SendHWLock, flags); | 550 | spin_lock_irqsave(&etdev->send_hw_lock, flags); |
551 | 551 | ||
552 | thiscopy = NUM_DESC_PER_RING_TX - | 552 | thiscopy = NUM_DESC_PER_RING_TX - |
553 | INDEX10(etdev->tx_ring.send_idx); | 553 | INDEX10(etdev->tx_ring.send_idx); |
@@ -613,7 +613,7 @@ static int nic_send_packet(struct et131x_adapter *etdev, struct tcb *tcb) | |||
613 | writel(PARM_TX_TIME_INT_DEF * NANO_IN_A_MICRO, | 613 | writel(PARM_TX_TIME_INT_DEF * NANO_IN_A_MICRO, |
614 | &etdev->regs->global.watchdog_timer); | 614 | &etdev->regs->global.watchdog_timer); |
615 | } | 615 | } |
616 | spin_unlock_irqrestore(&etdev->SendHWLock, flags); | 616 | spin_unlock_irqrestore(&etdev->send_hw_lock, flags); |
617 | 617 | ||
618 | return 0; | 618 | return 0; |
619 | } | 619 | } |