diff options
| author | David S. Miller <[email protected]> | 2015-03-05 19:58:23 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2015-03-05 19:59:32 +0000 |
| commit | 08c852c43a707333baa1329c4df6f628c345bbc3 (patch) | |
| tree | ecb76c714145e1306435ab184a182721d45f0852 /drivers/net/xen-netback/interface.c | |
| parent | ARM: fix typos in smc91x platform data (diff) | |
| parent | xen-netback: refactor xenvif_handle_frag_list() (diff) | |
| download | kernel-08c852c43a707333baa1329c4df6f628c345bbc3.tar.gz kernel-08c852c43a707333baa1329c4df6f628c345bbc3.zip | |
Merge branch 'xen-netback'
David Vrabel says:
====================
xen-netback: fix ethtool stats and memory leak
A couple of bug fixes for netback:
- make ethool stats to report the correct values.
- don't leak 1 MiB every time a VIF is destroyed.
Changes in v2:
- Split 2nd patch into leak fix and refactor patches
====================
Acked-by: Ian Campbell <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'drivers/net/xen-netback/interface.c')
| -rw-r--r-- | drivers/net/xen-netback/interface.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index f38227afe099..3aa8648080c8 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c @@ -340,12 +340,11 @@ static void xenvif_get_ethtool_stats(struct net_device *dev, unsigned int num_queues = vif->num_queues; int i; unsigned int queue_index; - struct xenvif_stats *vif_stats; for (i = 0; i < ARRAY_SIZE(xenvif_stats); i++) { unsigned long accum = 0; for (queue_index = 0; queue_index < num_queues; ++queue_index) { - vif_stats = &vif->queues[queue_index].stats; + void *vif_stats = &vif->queues[queue_index].stats; accum += *(unsigned long *)(vif_stats + xenvif_stats[i].offset); } data[i] = accum; |