diff options
| author | Alan Cox <alan@linux.intel.com> | 2009-10-06 15:49:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 12:23:07 -0800 |
| commit | c78732ad75b3917f6a93292be1612527d9c0be9d (patch) | |
| tree | b5da4b71b20479f2596b69c99f3cd504176bb7e5 /drivers/staging/et131x/et131x_netdev.c | |
| parent | 9251d71a4ec3e20189bb182cdc3af00f1152da81 (diff) | |
Staging: et131x: Clean up tx naming
Clean up the names to be Linux like
Remove the unused pad buffer
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et131x_netdev.c')
| -rw-r--r-- | drivers/staging/et131x/et131x_netdev.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/et131x/et131x_netdev.c b/drivers/staging/et131x/et131x_netdev.c index 7c55f5d52d5..24d97b4fa6f 100644 --- a/drivers/staging/et131x/et131x_netdev.c +++ b/drivers/staging/et131x/et131x_netdev.c @@ -541,19 +541,19 @@ void et131x_tx_timeout(struct net_device *netdev) /* Is send stuck? */ spin_lock_irqsave(&etdev->TCBSendQLock, flags); - tcb = etdev->tx_ring.CurrSendHead; + tcb = etdev->tx_ring.send_head; if (tcb != NULL) { - tcb->Count++; + tcb->count++; - if (tcb->Count > NIC_SEND_HANG_THRESHOLD) { + if (tcb->count > NIC_SEND_HANG_THRESHOLD) { spin_unlock_irqrestore(&etdev->TCBSendQLock, flags); dev_warn(&etdev->pdev->dev, "Send stuck - reset. tcb->WrIndex %x, Flags 0x%08x\n", - tcb->WrIndex, - tcb->Flags); + tcb->index, + tcb->flags); et131x_close(netdev); et131x_open(netdev); |