lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sis190: account for Tx errors

Browse Source 
Update the collision counter as well.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
This commit is contained in:
Francois Romieu
2007-11-21 22:30:37 +01:00
parent c34ebbae01
commit 697c269610
1 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/net/sis190.c
View File

@ -212,6 +212,12 @@ enum _DescStatusBit {
THOL2 = 0x20000000, THOL2 = 0x20000000,
THOL1 = 0x10000000, THOL1 = 0x10000000,
THOL0 = 0x00000000, THOL0 = 0x00000000,
WND = 0x00080000,
TABRT = 0x00040000,
FIFO = 0x00020000,
LINK = 0x00010000,
ColCountMask = 0x0000ffff,
/* RxDesc.status */ /* RxDesc.status */
IPON = 0x20000000, IPON = 0x20000000,
TCPON = 0x10000000, TCPON = 0x10000000,
@ -653,9 +659,31 @@ static void sis190_unmap_tx_skb(struct pci_dev *pdev, struct sk_buff *skb,
memset(desc, 0x00, sizeof(*desc)); memset(desc, 0x00, sizeof(*desc));
} }
static inline int sis190_tx_pkt_err(u32 status, struct net_device_stats *stats)
{
#define TxErrMask (WND | TABRT | FIFO | LINK)
if (!unlikely(status & TxErrMask))
return 0;
if (status & WND)
stats->tx_window_errors++;
if (status & TABRT)
stats->tx_aborted_errors++;
if (status & FIFO)
stats->tx_fifo_errors++;
if (status & LINK)
stats->tx_carrier_errors++;
stats->tx_errors++;
return -1;
}
static void sis190_tx_interrupt(struct net_device *dev, static void sis190_tx_interrupt(struct net_device *dev,
struct sis190_private *tp, void __iomem *ioaddr) struct sis190_private *tp, void __iomem *ioaddr)
{ {
struct net_device_stats *stats = &dev->stats;
u32 pending, dirty_tx = tp->dirty_tx; u32 pending, dirty_tx = tp->dirty_tx;
/* /*
* It would not be needed if queueing was allowed to be enabled * It would not be needed if queueing was allowed to be enabled
@ -670,15 +698,19 @@ static void sis190_tx_interrupt(struct net_device *dev,
for (; pending; pending--, dirty_tx++) { for (; pending; pending--, dirty_tx++) {
unsigned int entry = dirty_tx % NUM_TX_DESC; unsigned int entry = dirty_tx % NUM_TX_DESC;
struct TxDesc *txd = tp->TxDescRing + entry; struct TxDesc *txd = tp->TxDescRing + entry;
u32 status = le32_to_cpu(txd->status);
struct sk_buff *skb; struct sk_buff *skb;
if (le32_to_cpu(txd->status) & OWNbit) if (status & OWNbit)
break; break;
skb = tp->Tx_skbuff[entry]; skb = tp->Tx_skbuff[entry];
dev->stats.tx_packets++; if (likely(sis190_tx_pkt_err(status, stats) == 0)) {
dev->stats.tx_bytes += skb->len; stats->tx_packets++;
stats->tx_bytes += skb->len;
stats->collisions += ((status & ColCountMask) - 1);
}
sis190_unmap_tx_skb(tp->pci_dev, skb, txd); sis190_unmap_tx_skb(tp->pci_dev, skb, txd);
tp->Tx_skbuff[entry] = NULL; tp->Tx_skbuff[entry] = NULL;