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

Commit 1a6afe8a authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

clip: convert to internal network_device_stats 



Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0ba25ff4

include/net/atmclip.h

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ struct atmarp_entry { 
struct clip_priv {

	int number;			/* for convenience ... */

	spinlock_t xoff_lock;		/* ensures that pop is atomic (SMP) */

	struct net_device_stats stats;

	struct net_device *next;	/* next CLIP interface */

};

net/atm/clip.c

+12 −18
Original line number Diff line number Diff line
@@ -214,15 +214,15 @@ static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb) 
		skb->protocol = ((__be16 *) skb->data)[3];

		skb_pull(skb, RFC1483LLC_LEN);

		if (skb->protocol == htons(ETH_P_ARP)) {

			PRIV(skb->dev)->stats.rx_packets++;

			PRIV(skb->dev)->stats.rx_bytes += skb->len;

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

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

			clip_arp_rcv(skb);

			return;

		}

	}

	clip_vcc->last_use = jiffies;

	PRIV(skb->dev)->stats.rx_packets++;

	PRIV(skb->dev)->stats.rx_bytes += skb->len;

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

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

	memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data));

	netif_rx(skb);

}
@@ -372,7 +372,7 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	if (!skb->dst) {

		printk(KERN_ERR "clip_start_xmit: skb->dst == NULL\n");

		dev_kfree_skb(skb);

		clip_priv->stats.tx_dropped++;

		dev->stats.tx_dropped++;

		return 0;

	}

	if (!skb->dst->neighbour) {
@@ -380,13 +380,13 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		skb->dst->neighbour = clip_find_neighbour(skb->dst, 1);

		if (!skb->dst->neighbour) {

			dev_kfree_skb(skb);	/* lost that one */

			clip_priv->stats.tx_dropped++;

			dev->stats.tx_dropped++;

			return 0;

		}

#endif

		printk(KERN_ERR "clip_start_xmit: NO NEIGHBOUR !\n");

		dev_kfree_skb(skb);

		clip_priv->stats.tx_dropped++;

		dev->stats.tx_dropped++;

		return 0;

	}

	entry = NEIGH2ENTRY(skb->dst->neighbour);
@@ -400,7 +400,7 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev) 
			skb_queue_tail(&entry->neigh->arp_queue, skb);

		else {

			dev_kfree_skb(skb);

			clip_priv->stats.tx_dropped++;

			dev->stats.tx_dropped++;

		}

		return 0;

	}
@@ -423,8 +423,8 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		printk(KERN_WARNING "clip_start_xmit: XOFF->XOFF transition\n");

		return 0;

	}

	clip_priv->stats.tx_packets++;

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

	dev->stats.tx_packets++;

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

	vcc->send(vcc, skb);

	if (atm_may_send(vcc, 0)) {

		entry->vccs->xoff = 0;
@@ -443,11 +443,6 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	return 0;

}



static struct net_device_stats *clip_get_stats(struct net_device *dev)

{

	return &PRIV(dev)->stats;

}



static int clip_mkip(struct atm_vcc *vcc, int timeout)

{

	struct clip_vcc *clip_vcc;
@@ -501,8 +496,8 @@ static int clip_mkip(struct atm_vcc *vcc, int timeout) 


			skb_get(skb);

			clip_push(vcc, skb);

			PRIV(skb->dev)->stats.rx_packets--;

			PRIV(skb->dev)->stats.rx_bytes -= len;

			skb->dev->stats.rx_packets--;

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

			kfree_skb(skb);

		}
@@ -561,7 +556,6 @@ static void clip_setup(struct net_device *dev) 
{

	dev->hard_start_xmit = clip_start_xmit;

	/* sg_xmit ... */

	dev->get_stats = clip_get_stats;

	dev->type = ARPHRD_ATM;

	dev->hard_header_len = RFC1483LLC_LEN;

	dev->mtu = RFC1626_MTU;