diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-17 01:34:01 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-17 01:34:01 +0100 |
| commit | 3f64116a838e6c3468f9d5eed7f1f87cf3a2c3eb (patch) | |
| tree | 388024d2ddbdcb9991ef4b472dfac31e425b807e /drivers/net/xen-netback | |
| parent | cxgb4: Remove redundant code in t4_uld_clean_up() (diff) | |
| parent | Merge tag 'media/v4.10-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mc... (diff) | |
| download | linux-3f64116a838e6c3468f9d5eed7f1f87cf3a2c3eb.tar.xz linux-3f64116a838e6c3468f9d5eed7f1f87cf3a2c3eb.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/xen-netback')
| -rw-r--r-- | drivers/net/xen-netback/common.h | 8 | ||||
| -rw-r--r-- | drivers/net/xen-netback/interface.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h index 3ce1f7da8647..530586be05b4 100644 --- a/drivers/net/xen-netback/common.h +++ b/drivers/net/xen-netback/common.h @@ -113,10 +113,10 @@ struct xenvif_stats { * A subset of struct net_device_stats that contains only the * fields that are updated in netback.c for each queue. */ - unsigned int rx_bytes; - unsigned int rx_packets; - unsigned int tx_bytes; - unsigned int tx_packets; + u64 rx_bytes; + u64 rx_packets; + u64 tx_bytes; + u64 tx_packets; /* Additional stats used by xenvif */ unsigned long rx_gso_checksum_fixup; diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index 1073b27e54aa..a2d326760a72 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c @@ -221,10 +221,10 @@ static struct net_device_stats *xenvif_get_stats(struct net_device *dev) { struct xenvif *vif = netdev_priv(dev); struct xenvif_queue *queue = NULL; - unsigned long rx_bytes = 0; - unsigned long rx_packets = 0; - unsigned long tx_bytes = 0; - unsigned long tx_packets = 0; + u64 rx_bytes = 0; + u64 rx_packets = 0; + u64 tx_bytes = 0; + u64 tx_packets = 0; unsigned int index; spin_lock(&vif->lock); |