From 31abdd2f99c0d6966eedd72c8a74b8d8326e4976 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 1 May 2007 22:32:50 +0200 Subject: [PATCH] --- yaml --- r: 53287 b: refs/heads/master c: 3f5d987e62412ce6540b97b622b03ca9c1677eee h: refs/heads/master i: 53285: 7d8ff22e9829266a946a22f832e2f56136eb898e 53283: dbda45472e052195838ba5b9cb0fc94373e47603 53279: 3391d252d8d3de6ba3e76822ea7078a503f00985 v: v3 --- [refs] | 2 +- trunk/drivers/net/a2065.c | 4 +--- trunk/drivers/net/ariadne.c | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 469b98abc0d1..c884317b785d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bff832cda7bd1a861fd43813c3037119e50e7d93 +refs/heads/master: 3f5d987e62412ce6540b97b622b03ca9c1677eee diff --git a/trunk/drivers/net/a2065.c b/trunk/drivers/net/a2065.c index 1226cbba0450..37534f3f8bf3 100644 --- a/trunk/drivers/net/a2065.c +++ b/trunk/drivers/net/a2065.c @@ -562,7 +562,6 @@ static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev) volatile struct lance_init_block *ib = lp->init_block; int entry, skblen, len; int status = 0; - static int outs; unsigned long flags; skblen = skb->len; @@ -607,8 +606,7 @@ static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev) /* Now, give the packet to the lance */ ib->btx_ring [entry].tmd1_bits = (LE_T1_POK|LE_T1_OWN); lp->tx_new = (lp->tx_new+1) & lp->tx_ring_mod_mask; - - outs++; + lp->stats.tx_bytes += skblen; if (TX_BUFFS_AVAIL <= 0) netif_stop_queue(dev); diff --git a/trunk/drivers/net/ariadne.c b/trunk/drivers/net/ariadne.c index a0e68e718531..a241ae7855a3 100644 --- a/trunk/drivers/net/ariadne.c +++ b/trunk/drivers/net/ariadne.c @@ -677,6 +677,7 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev) priv->cur_tx -= TX_RING_SIZE; priv->dirty_tx -= TX_RING_SIZE; } + priv->stats.tx_bytes += len; /* Trigger an immediate send poll. */ lance->RAP = CSR0; /* PCnet-ISA Controller Status */