Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[mv-sheeva.git] / net / 8021q / vlanproc.c

diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index afead353e215fc0028530b033ee9104c8bb51ca5..80e280f56686989796264db386f69057a65dc165 100644 (file)
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -278,25 +278,27 @@ 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);
-       const struct net_device_stats *stats;
+       struct rtnl_link_stats64 temp;
+       const struct rtnl_link_stats64 *stats;
        static const char fmt[] = "%30s %12lu\n";
+       static const char fmt64[] = "%30s %12llu\n";
        int i;
 
        if (!is_vlan_dev(vlandev))
                return 0;
 
-       stats = dev_get_stats(vlandev);
+       stats = dev_get_stats(vlandev, &temp);
        seq_printf(seq,
                   "%s  VID: %d  REORDER_HDR: %i  dev->priv_flags: %hx\n",
                   vlandev->name, dev_info->vlan_id,
                   (int)(dev_info->flags & 1), vlandev->priv_flags);
 
-       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);
+       seq_printf(seq, fmt64, "total frames received", stats->rx_packets);
+       seq_printf(seq, fmt64, "total bytes received", stats->rx_bytes);
+       seq_printf(seq, fmt64, "Broadcast/Multicast Rcvd", stats->multicast);
        seq_puts(seq, "\n");
-       seq_printf(seq, fmt, "total frames transmitted", stats->tx_packets);
-       seq_printf(seq, fmt, "total bytes transmitted", stats->tx_bytes);
+       seq_printf(seq, fmt64, "total frames transmitted", stats->tx_packets);
+       seq_printf(seq, fmt64, "total bytes transmitted", stats->tx_bytes);
        seq_printf(seq, fmt, "total headroom inc",
                   dev_info->cnt_inc_headroom_on_tx);
        seq_printf(seq, fmt, "total encap on xmit",