Commit 237225f7 authored by Paulius Zaleckas's avatar Paulius Zaleckas Committed by Jeff Garzik
Browse files

8139cp: use netstats in net_device structure 



Use net_device_stats from net_device structure instead of local.

Signed-off-by: default avatarPaulius Zaleckas <paulius.zaleckas@teltonika.lt>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent ad0e8a4c

drivers/net/8139cp.c

+21 −22
Original line number Diff line number Diff line
@@ -340,7 +340,6 @@ struct cp_private { 
	u32			rx_config;

	u16			cpcmd;



	struct net_device_stats net_stats;

	struct cp_extra_stats	cp_stats;



	unsigned		rx_head		____cacheline_aligned;
@@ -457,8 +456,8 @@ static inline void cp_rx_skb (struct cp_private *cp, struct sk_buff *skb, 
{

	skb->protocol = eth_type_trans (skb, cp->dev);



	cp->net_stats.rx_packets++;

	cp->net_stats.rx_bytes += skb->len;

	cp->dev->stats.rx_packets++;

	cp->dev->stats.rx_bytes += skb->len;

	cp->dev->last_rx = jiffies;



#if CP_VLAN_TAG_USED
@@ -477,17 +476,17 @@ static void cp_rx_err_acct (struct cp_private *cp, unsigned rx_tail, 
		printk (KERN_DEBUG

			"%s: rx err, slot %d status 0x%x len %d\n",

			cp->dev->name, rx_tail, status, len);

	cp->net_stats.rx_errors++;

	cp->dev->stats.rx_errors++;

	if (status & RxErrFrame)

		cp->net_stats.rx_frame_errors++;

		cp->dev->stats.rx_frame_errors++;

	if (status & RxErrCRC)

		cp->net_stats.rx_crc_errors++;

		cp->dev->stats.rx_crc_errors++;

	if ((status & RxErrRunt) || (status & RxErrLong))

		cp->net_stats.rx_length_errors++;

		cp->dev->stats.rx_length_errors++;

	if ((status & (FirstFrag | LastFrag)) != (FirstFrag | LastFrag))

		cp->net_stats.rx_length_errors++;

		cp->dev->stats.rx_length_errors++;

	if (status & RxErrFIFO)

		cp->net_stats.rx_fifo_errors++;

		cp->dev->stats.rx_fifo_errors++;

}



static inline unsigned int cp_rx_csum_ok (u32 status)
@@ -539,7 +538,7 @@ static int cp_rx_poll(struct napi_struct *napi, int budget) 
			 * that RX fragments are never encountered

			 */

			cp_rx_err_acct(cp, rx_tail, status, len);

			cp->net_stats.rx_dropped++;

			dev->stats.rx_dropped++;

			cp->cp_stats.rx_frags++;

			goto rx_next;

		}
@@ -556,7 +555,7 @@ static int cp_rx_poll(struct napi_struct *napi, int budget) 
		buflen = cp->rx_buf_sz + RX_OFFSET;

		new_skb = dev_alloc_skb (buflen);

		if (!new_skb) {

			cp->net_stats.rx_dropped++;

			dev->stats.rx_dropped++;

			goto rx_next;

		}
@@ -710,20 +709,20 @@ static void cp_tx (struct cp_private *cp) 
				if (netif_msg_tx_err(cp))

					printk(KERN_DEBUG "%s: tx err, status 0x%x\n",

					       cp->dev->name, status);

				cp->net_stats.tx_errors++;

				cp->dev->stats.tx_errors++;

				if (status & TxOWC)

					cp->net_stats.tx_window_errors++;

					cp->dev->stats.tx_window_errors++;

				if (status & TxMaxCol)

					cp->net_stats.tx_aborted_errors++;

					cp->dev->stats.tx_aborted_errors++;

				if (status & TxLinkFail)

					cp->net_stats.tx_carrier_errors++;

					cp->dev->stats.tx_carrier_errors++;

				if (status & TxFIFOUnder)

					cp->net_stats.tx_fifo_errors++;

					cp->dev->stats.tx_fifo_errors++;

			} else {

				cp->net_stats.collisions +=

				cp->dev->stats.collisions +=

					((status >> TxColCntShift) & TxColCntMask);

				cp->net_stats.tx_packets++;

				cp->net_stats.tx_bytes += skb->len;

				cp->dev->stats.tx_packets++;

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

				if (netif_msg_tx_done(cp))

					printk(KERN_DEBUG "%s: tx done, slot %d\n", cp->dev->name, tx_tail);

			}
@@ -956,7 +955,7 @@ static void cp_set_rx_mode (struct net_device *dev) 
static void __cp_get_stats(struct cp_private *cp)

{

	/* only lower 24 bits valid; write any value to clear */

	cp->net_stats.rx_missed_errors += (cpr32 (RxMissed) & 0xffffff);

	cp->dev->stats.rx_missed_errors += (cpr32 (RxMissed) & 0xffffff);

	cpw32 (RxMissed, 0);

}
@@ -971,7 +970,7 @@ static struct net_device_stats *cp_get_stats(struct net_device *dev) 
 		__cp_get_stats(cp);

	spin_unlock_irqrestore(&cp->lock, flags);



	return &cp->net_stats;

	return &dev->stats;

}



static void cp_stop_hw (struct cp_private *cp)
@@ -1142,7 +1141,7 @@ static void cp_clean_rings (struct cp_private *cp) 
					 PCI_DMA_TODEVICE);

			if (le32_to_cpu(desc->opts1) & LastFrag)

				dev_kfree_skb(skb);

			cp->net_stats.tx_dropped++;

			cp->dev->stats.tx_dropped++;

		}

	}