Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index 1226cbba0450..81d5a374042a 100644
--- a/drivers/net/a2065.c
+++ b/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;
@@ -598,17 +597,16 @@ static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev)
         ib->btx_ring [entry].length = (-len) | 0xf000;
         ib->btx_ring [entry].misc = 0;
 
-        skb_copy_from_linear_data(skb, &ib->tx_buf [entry][0], skblen);
+        skb_copy_from_linear_data(skb, (void *)&ib->tx_buf [entry][0], skblen);
 
         /* Clear the slack of the packet, do I need this? */
         if (len != skblen)
-                memset ((char *) &ib->tx_buf [entry][skblen], 0, len - skblen);
+                memset ((void *) &ib->tx_buf [entry][skblen], 0, len - skblen);
 
         /* 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);