diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-01-21 00:19:31 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:08:25 -0800 |
| commit | 7bd38d778e3f2250e96fc277040879d66c30ecb4 (patch) | |
| tree | 555dbdf5c1cccc29710e53a428d979384451b05a /net/8021q | |
| parent | b7a4a83629c1ddde8c2e6a872618c66577cb20f0 (diff) | |
| download | linux-3.10-7bd38d778e3f2250e96fc277040879d66c30ecb4.tar.gz linux-3.10-7bd38d778e3f2250e96fc277040879d66c30ecb4.tar.bz2 linux-3.10-7bd38d778e3f2250e96fc277040879d66c30ecb4.zip | |
[VLAN]: Use dev->stats
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan.c | 2 | ||||
| -rw-r--r-- | net/8021q/vlan_dev.c | 8 | ||||
| -rw-r--r-- | net/8021q/vlanproc.c | 5 |
3 files changed, 5 insertions, 10 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index af252556942..54f23469641 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -366,8 +366,6 @@ void vlan_setup(struct net_device *new_dev) * the global list. * iflink is set as well. */ - new_dev->get_stats = vlan_dev_get_stats; - /* Make this thing known as a VLAN device */ new_dev->priv_flags |= IFF_802_1Q_VLAN; diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 4f99bb86af5..9543e918279 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -174,7 +174,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, skb->dev->last_rx = jiffies; /* Bump the rx counters for the VLAN device. */ - stats = vlan_dev_get_stats(skb->dev); + stats = &skb->dev->stats; stats->rx_packets++; stats->rx_bytes += skb->len; @@ -422,7 +422,7 @@ int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev, skb = skb_realloc_headroom(sk_tmp, dev->hard_header_len); kfree_skb(sk_tmp); if (skb == NULL) { - struct net_device_stats *stats = vlan_dev_get_stats(vdev); + struct net_device_stats *stats = &vdev->stats; stats->tx_dropped++; return -ENOMEM; } @@ -453,7 +453,7 @@ int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev, int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct net_device_stats *stats = vlan_dev_get_stats(dev); + struct net_device_stats *stats = &dev->stats; struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data); /* Handle non-VLAN frames if they are sent to us, for example by DHCP. @@ -514,7 +514,7 @@ int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) int vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct net_device_stats *stats = vlan_dev_get_stats(dev); + struct net_device_stats *stats = &dev->stats; unsigned short veth_TCI; /* Construct the second two bytes. This field looks something diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c index 6cefdf8e381..1972d5cc34e 100644 --- a/net/8021q/vlanproc.c +++ b/net/8021q/vlanproc.c @@ -316,7 +316,7 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset) { struct net_device *vlandev = (struct net_device *) seq->private; const struct vlan_dev_info *dev_info = VLAN_DEV_INFO(vlandev); - struct net_device_stats *stats; + struct net_device_stats *stats = &vlandev->stats; static const char fmt[] = "%30s %12lu\n"; int i; @@ -327,9 +327,6 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset) vlandev->name, dev_info->vlan_id, (int)(dev_info->flags & 1), vlandev->priv_flags); - - stats = vlan_dev_get_stats(vlandev); - seq_printf(seq, fmt, "total frames received", stats->rx_packets); seq_printf(seq, fmt, "total bytes received", stats->rx_bytes); seq_printf(seq, fmt, "Broadcast/Multicast Rcvd", stats->multicast); |