[VLAN]: Use dev->stats

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 0325d6b17e07f64192284558b883c84af341bb8c..07db4169463ef37a44b481cf0c774c240d8123e3 100644 (file)
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -140,18 +140,11 @@ struct vlan_dev_info {
        struct proc_dir_entry *dent;    /* Holds the proc data */
        unsigned long cnt_inc_headroom_on_tx; /* How many times did we have to grow the skb on TX. */
        unsigned long cnt_encap_on_xmit;      /* How many times did we have to encapsulate the skb on TX. */
-       struct net_device_stats dev_stats; /* Device stats (rx-bytes, tx-pkts, etc...) */
 };
 
 #define VLAN_DEV_INFO(x) ((struct vlan_dev_info *)(x->priv))
 
 /* inline functions */
-
-static inline struct net_device_stats *vlan_dev_get_stats(struct net_device *dev)
-{
-       return &(VLAN_DEV_INFO(dev)->dev_stats);
-}
-
 static inline __u32 vlan_get_ingress_priority(struct net_device *dev,
                                              unsigned short vlan_tag)
 {
@@ -196,7 +189,7 @@ static inline int __vlan_hwaccel_rx(struct sk_buff *skb,
 
        skb->dev->last_rx = jiffies;
 
-       stats = vlan_dev_get_stats(skb->dev);
+       stats = &skb->dev->stats;
        stats->rx_packets++;
        stats->rx_bytes += skb->len;
 

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index af252556942412dee22d7ba529fca4eaa6959dce..54f2346964112e5535af96f635e7e4868fb9b1f2 100644 (file)
--- 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 4f99bb86af5c594b1bb77042ba43b321a9d50d4a..9543e91827965ad1580be4bb3a423f056dd7fad1 100644 (file)
--- 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 6cefdf8e381a3b40bf9d6d78c5535e25bab6f612..1972d5cc34e4398531591d19856f52d2797762fc 100644 (file)
--- 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);