Skip to content

Commit

Permalink
net: 3c574_cs fix stats.tx_bytes counter
Browse files Browse the repository at this point in the history
Update the stats counter calculation in 3c574_cs, similar
to the method used in 3c589_cs. This corrects the contents
of the counter on tests using a "Megahertz 574B" card.

[linux@dominikbrodowski.net: clean up commit message]
Signed-off-by: Alexander Kurz <linux@kbdbabel.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Alexander Kurz authored and David S. Miller committed Apr 21, 2010
1 parent bc8e4b9 commit df245dc
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/net/pcmcia/3c574_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -781,8 +781,13 @@ static netdev_tx_t el3_start_xmit(struct sk_buff *skb,
inw(ioaddr + EL3_STATUS));

spin_lock_irqsave(&lp->window_lock, flags);

dev->stats.tx_bytes += skb->len;

/* Put out the doubleword header... */
outw(skb->len, ioaddr + TX_FIFO);
outw(0, ioaddr + TX_FIFO);
/* ... and the packet rounded to a doubleword. */
outsl(ioaddr + TX_FIFO, skb->data, (skb->len+3)>>2);

dev->trans_start = jiffies;
Expand Down Expand Up @@ -1021,8 +1026,6 @@ static void update_stats(struct net_device *dev)
/* BadSSD */ inb(ioaddr + 12);
up = inb(ioaddr + 13);

dev->stats.tx_bytes += tx + ((up & 0xf0) << 12);

EL3WINDOW(1);
}

Expand Down

0 comments on commit df245dc

Please sign in to comment.