1 diff -p -u -r1.5.2.33 linux/drivers/net/au1000_eth.c
2 --- linux/drivers/net/au1000_eth.c 26 Nov 2004 08:40:13 -0000 1.5.2.33
3 +++ linux/drivers/net/au1000_eth.c 21 Jan 2005 14:33:47 -0000
4 @@ -83,7 +83,7 @@ static void au1000_tx_timeout(struct net
5 static int au1000_set_config(struct net_device *dev, struct ifmap *map);
6 static void set_rx_mode(struct net_device *);
7 static struct net_device_stats *au1000_get_stats(struct net_device *);
8 -static inline void update_tx_stats(struct net_device *, u32, u32);
9 +static inline void update_tx_stats(struct net_device *, u32);
10 static inline void update_rx_stats(struct net_device *, u32);
11 static void au1000_timer(unsigned long);
12 static int au1000_ioctl(struct net_device *, struct ifreq *, int);
13 @@ -1542,14 +1542,11 @@ static void __exit au1000_cleanup_module
17 -update_tx_stats(struct net_device *dev, u32 status, u32 pkt_len)
18 +update_tx_stats(struct net_device *dev, u32 status)
20 struct au1000_private *aup = (struct au1000_private *) dev->priv;
21 struct net_device_stats *ps = &aup->stats;
24 - ps->tx_bytes += pkt_len;
26 if (status & TX_FRAME_ABORTED) {
27 if (dev->if_port == IF_PORT_100BASEFX) {
28 if (status & (TX_JAB_TIMEOUT | TX_UNDERRUN)) {
29 @@ -1582,7 +1579,7 @@ static void au1000_tx_ack(struct net_dev
30 ptxd = aup->tx_dma_ring[aup->tx_tail];
32 while (ptxd->buff_stat & TX_T_DONE) {
33 - update_tx_stats(dev, ptxd->status, ptxd->len & 0x3ff);
34 + update_tx_stats(dev, ptxd->status);
35 ptxd->buff_stat &= ~TX_T_DONE;
38 @@ -1604,6 +1601,7 @@ static void au1000_tx_ack(struct net_dev
39 static int au1000_tx(struct sk_buff *skb, struct net_device *dev)
41 struct au1000_private *aup = (struct au1000_private *) dev->priv;
42 + struct net_device_stats *ps = &aup->stats;
43 volatile tx_dma_t *ptxd;
46 @@ -1623,7 +1621,7 @@ static int au1000_tx(struct sk_buff *skb
49 else if (buff_stat & TX_T_DONE) {
50 - update_tx_stats(dev, ptxd->status, ptxd->len & 0x3ff);
51 + update_tx_stats(dev, ptxd->status);
55 @@ -1643,6 +1641,9 @@ static int au1000_tx(struct sk_buff *skb
60 + ps->tx_bytes += ptxd->len;
62 ptxd->buff_stat = pDB->dma_addr | TX_DMA_ENABLE;