Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 198191c4 authored by Krzysztof Halasa's avatar Krzysztof Halasa Committed by Jeff Garzik
Browse files

WAN: convert drivers to use built-in netdev_stats 



There is no point in using separate net_device_stats structs when
the one in struct net_device is present. Compiles.

Signed-off-by: default avatarKrzysztof Hałasa <khc@pm.waw.pl>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 844290e5

drivers/char/pcmcia/synclink_cs.c

+12 −16
Original line number Diff line number Diff line
@@ -3886,9 +3886,8 @@ static bool rx_get_frame(MGSLPC_INFO *info) 
		framesize = 0;

#if SYNCLINK_GENERIC_HDLC

		{

			struct net_device_stats *stats = hdlc_stats(info->netdev);

			stats->rx_errors++;

			stats->rx_frame_errors++;

			info->netdev->stats.rx_errors++;

			info->netdev->stats.rx_frame_errors++;

		}

#endif

	} else
@@ -4144,7 +4143,6 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, 
static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)

{

	MGSLPC_INFO *info = dev_to_port(dev);

	struct net_device_stats *stats = hdlc_stats(dev);

	unsigned long flags;



	if (debug_level >= DEBUG_LEVEL_INFO)
@@ -4159,8 +4157,8 @@ static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev) 
	info->tx_put = info->tx_count = skb->len;



	/* update network statistics */

	stats->tx_packets++;

	stats->tx_bytes += skb->len;

	dev->stats.tx_packets++;

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



	/* done with socket buffer, so free it */

	dev_kfree_skb(skb);
@@ -4376,14 +4374,13 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
static void hdlcdev_tx_timeout(struct net_device *dev)

{

	MGSLPC_INFO *info = dev_to_port(dev);

	struct net_device_stats *stats = hdlc_stats(dev);

	unsigned long flags;



	if (debug_level >= DEBUG_LEVEL_INFO)

		printk("hdlcdev_tx_timeout(%s)\n",dev->name);



	stats->tx_errors++;

	stats->tx_aborted_errors++;

	dev->stats.tx_errors++;

	dev->stats.tx_aborted_errors++;



	spin_lock_irqsave(&info->lock,flags);

	tx_stop(info);
@@ -4416,27 +4413,26 @@ static void hdlcdev_rx(MGSLPC_INFO *info, char *buf, int size) 
{

	struct sk_buff *skb = dev_alloc_skb(size);

	struct net_device *dev = info->netdev;

	struct net_device_stats *stats = hdlc_stats(dev);



	if (debug_level >= DEBUG_LEVEL_INFO)

		printk("hdlcdev_rx(%s)\n",dev->name);



	if (skb == NULL) {

		printk(KERN_NOTICE "%s: can't alloc skb, dropping packet\n", dev->name);

		stats->rx_dropped++;

		dev->stats.rx_dropped++;

		return;

	}



	memcpy(skb_put(skb, size), buf, size);



	skb->protocol = hdlc_type_trans(skb, info->netdev);

	skb->protocol = hdlc_type_trans(skb, dev);



	stats->rx_packets++;

	stats->rx_bytes += size;

	dev->stats.rx_packets++;

	dev->stats.rx_bytes += size;



	netif_rx(skb);



	info->netdev->last_rx = jiffies;

	dev->last_rx = jiffies;

}



/**

drivers/char/synclink.c

+15 −18
Original line number Diff line number Diff line
@@ -6640,9 +6640,8 @@ static bool mgsl_get_rx_frame(struct mgsl_struct *info) 
		framesize = 0;

#if SYNCLINK_GENERIC_HDLC

		{

			struct net_device_stats *stats = hdlc_stats(info->netdev);

			stats->rx_errors++;

			stats->rx_frame_errors++;

			info->netdev->stats.rx_errors++;

			info->netdev->stats.rx_frame_errors++;

		}

#endif

	} else
@@ -7753,7 +7752,6 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, 
static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct mgsl_struct *info = dev_to_port(dev);

	struct net_device_stats *stats = hdlc_stats(dev);

	unsigned long flags;



	if (debug_level >= DEBUG_LEVEL_INFO)
@@ -7767,8 +7765,8 @@ static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev) 
	mgsl_load_tx_dma_buffer(info, skb->data, skb->len);



	/* update network statistics */

	stats->tx_packets++;

	stats->tx_bytes += skb->len;

	dev->stats.tx_packets++;

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



	/* done with socket buffer, so free it */

	dev_kfree_skb(skb);
@@ -7984,14 +7982,13 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
static void hdlcdev_tx_timeout(struct net_device *dev)

{

	struct mgsl_struct *info = dev_to_port(dev);

	struct net_device_stats *stats = hdlc_stats(dev);

	unsigned long flags;



	if (debug_level >= DEBUG_LEVEL_INFO)

		printk("hdlcdev_tx_timeout(%s)\n",dev->name);



	stats->tx_errors++;

	stats->tx_aborted_errors++;

	dev->stats.tx_errors++;

	dev->stats.tx_aborted_errors++;



	spin_lock_irqsave(&info->irq_spinlock,flags);

	usc_stop_transmitter(info);
@@ -8024,27 +8021,27 @@ static void hdlcdev_rx(struct mgsl_struct *info, char *buf, int size) 
{

	struct sk_buff *skb = dev_alloc_skb(size);

	struct net_device *dev = info->netdev;

	struct net_device_stats *stats = hdlc_stats(dev);



	if (debug_level >= DEBUG_LEVEL_INFO)

		printk("hdlcdev_rx(%s)\n", dev->name);



	if (skb == NULL) {

		printk(KERN_NOTICE "%s: can't alloc skb, dropping packet\n", dev->name);

		stats->rx_dropped++;

		printk(KERN_NOTICE "%s: can't alloc skb, dropping packet\n",

		       dev->name);

		dev->stats.rx_dropped++;

		return;

	}



	memcpy(skb_put(skb, size), buf, size);



	skb->protocol = hdlc_type_trans(skb, info->netdev);

	skb->protocol = hdlc_type_trans(skb, dev);



	stats->rx_packets++;

	stats->rx_bytes += size;

	dev->stats.rx_packets++;

	dev->stats.rx_bytes += size;



	netif_rx(skb);



	info->netdev->last_rx = jiffies;

	dev->last_rx = jiffies;

}



/**

drivers/char/synclink_gt.c

+12 −16
Original line number Diff line number Diff line
@@ -1544,7 +1544,6 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, 
static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct slgt_info *info = dev_to_port(dev);

	struct net_device_stats *stats = hdlc_stats(dev);

	unsigned long flags;



	DBGINFO(("%s hdlc_xmit\n", dev->name));
@@ -1557,8 +1556,8 @@ static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev) 
	tx_load(info, skb->data, skb->len);



	/* update network statistics */

	stats->tx_packets++;

	stats->tx_bytes += skb->len;

	dev->stats.tx_packets++;

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



	/* done with socket buffer, so free it */

	dev_kfree_skb(skb);
@@ -1775,13 +1774,12 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
static void hdlcdev_tx_timeout(struct net_device *dev)

{

	struct slgt_info *info = dev_to_port(dev);

	struct net_device_stats *stats = hdlc_stats(dev);

	unsigned long flags;



	DBGINFO(("%s hdlcdev_tx_timeout\n", dev->name));



	stats->tx_errors++;

	stats->tx_aborted_errors++;

	dev->stats.tx_errors++;

	dev->stats.tx_aborted_errors++;



	spin_lock_irqsave(&info->lock,flags);

	tx_stop(info);
@@ -1814,26 +1812,25 @@ static void hdlcdev_rx(struct slgt_info *info, char *buf, int size) 
{

	struct sk_buff *skb = dev_alloc_skb(size);

	struct net_device *dev = info->netdev;

	struct net_device_stats *stats = hdlc_stats(dev);



	DBGINFO(("%s hdlcdev_rx\n", dev->name));



	if (skb == NULL) {

		DBGERR(("%s: can't alloc skb, drop packet\n", dev->name));

		stats->rx_dropped++;

		dev->stats.rx_dropped++;

		return;

	}



	memcpy(skb_put(skb, size), buf, size);



	skb->protocol = hdlc_type_trans(skb, info->netdev);

	skb->protocol = hdlc_type_trans(skb, dev);



	stats->rx_packets++;

	stats->rx_bytes += size;

	dev->stats.rx_packets++;

	dev->stats.rx_bytes += size;



	netif_rx(skb);



	info->netdev->last_rx = jiffies;

	dev->last_rx = jiffies;

}



/**
@@ -4577,9 +4574,8 @@ check_again: 


#if SYNCLINK_GENERIC_HDLC

	if (framesize == 0) {

		struct net_device_stats *stats = hdlc_stats(info->netdev);

		stats->rx_errors++;

		stats->rx_frame_errors++;

		info->netdev->stats.rx_errors++;

		info->netdev->stats.rx_frame_errors++;

	}

#endif

drivers/char/synclinkmp.c

+14 −17
Original line number Diff line number Diff line
@@ -1678,7 +1678,6 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, 
static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)

{

	SLMP_INFO *info = dev_to_port(dev);

	struct net_device_stats *stats = hdlc_stats(dev);

	unsigned long flags;



	if (debug_level >= DEBUG_LEVEL_INFO)
@@ -1692,8 +1691,8 @@ static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev) 
	tx_load_dma_buffer(info, skb->data, skb->len);



	/* update network statistics */

	stats->tx_packets++;

	stats->tx_bytes += skb->len;

	dev->stats.tx_packets++;

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



	/* done with socket buffer, so free it */

	dev_kfree_skb(skb);
@@ -1909,14 +1908,13 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
static void hdlcdev_tx_timeout(struct net_device *dev)

{

	SLMP_INFO *info = dev_to_port(dev);

	struct net_device_stats *stats = hdlc_stats(dev);

	unsigned long flags;



	if (debug_level >= DEBUG_LEVEL_INFO)

		printk("hdlcdev_tx_timeout(%s)\n",dev->name);



	stats->tx_errors++;

	stats->tx_aborted_errors++;

	dev->stats.tx_errors++;

	dev->stats.tx_aborted_errors++;



	spin_lock_irqsave(&info->lock,flags);

	tx_stop(info);
@@ -1949,27 +1947,27 @@ static void hdlcdev_rx(SLMP_INFO *info, char *buf, int size) 
{

	struct sk_buff *skb = dev_alloc_skb(size);

	struct net_device *dev = info->netdev;

	struct net_device_stats *stats = hdlc_stats(dev);



	if (debug_level >= DEBUG_LEVEL_INFO)

		printk("hdlcdev_rx(%s)\n",dev->name);



	if (skb == NULL) {

		printk(KERN_NOTICE "%s: can't alloc skb, dropping packet\n", dev->name);

		stats->rx_dropped++;

		printk(KERN_NOTICE "%s: can't alloc skb, dropping packet\n",

		       dev->name);

		dev->stats.rx_dropped++;

		return;

	}



	memcpy(skb_put(skb, size), buf, size);



	skb->protocol = hdlc_type_trans(skb, info->netdev);

	skb->protocol = hdlc_type_trans(skb, dev);



	stats->rx_packets++;

	stats->rx_bytes += size;

	dev->stats.rx_packets++;

	dev->stats.rx_bytes += size;



	netif_rx(skb);



	info->netdev->last_rx = jiffies;

	dev->last_rx = jiffies;

}



/**
@@ -4983,9 +4981,8 @@ CheckAgain: 
		framesize = 0;

#if SYNCLINK_GENERIC_HDLC

		{

			struct net_device_stats *stats = hdlc_stats(info->netdev);

			stats->rx_errors++;

			stats->rx_frame_errors++;

			info->netdev->stats.rx_errors++;

			info->netdev->stats.rx_frame_errors++;

		}

#endif

	}

drivers/net/wan/c101.c

+3 −3
Original line number Diff line number Diff line
@@ -133,9 +133,9 @@ static void sca_msci_intr(port_t *port) 
	sca_out(stat & (ST1_UDRN | ST1_CDCD), MSCI0_OFFSET + ST1, port);



	if (stat & ST1_UDRN) {

		struct net_device_stats *stats = hdlc_stats(port_to_dev(port));

		stats->tx_errors++; /* TX Underrun error detected */

		stats->tx_fifo_errors++;

		/* TX Underrun error detected */

		port_to_dev(port)->stats.tx_errors++;

		port_to_dev(port)->stats.tx_fifo_errors++;

	}



	stat = sca_in(MSCI1_OFFSET + ST1, port); /* read MSCI1 ST1 status */