diff options
| author |   Mark Einon <mark.einon@gmail.com> | 2014-09-14 16:58:59 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-19 16:04:52 -0700 |
| commit | 82d95799d89b0cb3ad4c15c60e2c19862cb3a459 (patch) | |
| tree | c070f8dbb2ad8820910a772ba96cec471abd66d7 /drivers/staging/et131x | |
| parent | staging: et131x: Remove blank lines form et131x.c (diff) | |
| download | linux-dev-82d95799d89b0cb3ad4c15c60e2c19862cb3a459.tar.xz linux-dev-82d95799d89b0cb3ad4c15c60e2c19862cb3a459.zip | |
staging: et131x: Simplify unlocking tcb_send_qlock in et131x_tx_timeout()
The tcb_send_qlock spinlock is unlocked in all three paths at the end of
et131x_tx_timeout(). We can call it once before entering any of the paths,
saving ourselves a few lines of code.
This change puts tcb->count++ outside of the lock, but et131x_tx_timeout()
itself is protected by the tx_global_lock, so this shouldn't matter.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/et131x')
| -rw-r--r-- | drivers/staging/et131x/et131x.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index daa4e24ef9ed..c8f54264865f 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c @@ -4170,16 +4170,13 @@ static void et131x_tx_timeout(struct net_device *netdev) /* Is send stuck? */ spin_lock_irqsave(&adapter->tcb_send_qlock, flags); - tcb = tx_ring->send_head; + spin_unlock_irqrestore(&adapter->tcb_send_qlock, flags); - if (tcb != NULL) { + if (tcb) { tcb->count++; if (tcb->count > NIC_SEND_HANG_THRESHOLD) { - spin_unlock_irqrestore(&adapter->tcb_send_qlock, - flags); - dev_warn(&adapter->pdev->dev, "Send stuck - reset. tcb->WrIndex %x\n", tcb->index); @@ -4189,11 +4186,8 @@ static void et131x_tx_timeout(struct net_device *netdev) /* perform reset of tx/rx */ et131x_disable_txrx(netdev); et131x_enable_txrx(netdev); - return; } } - - spin_unlock_irqrestore(&adapter->tcb_send_qlock, flags); } /* et131x_change_mtu - The handler called to change the MTU for the device */ |