From 78f150d92ebf3ebc2de3d961a2cdfea376290258 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Fri, 16 Nov 2007 02:29:24 -0800 Subject: [PATCH] --- yaml --- r: 74188 b: refs/heads/master c: 483b23ffa3a5f44767038b0a676d757e0668437e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/route.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 5f04423ee692..2031eeb736d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b242e891c218162cfbae064b1a9136cdbed5ee53 +refs/heads/master: 483b23ffa3a5f44767038b0a676d757e0668437e diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index 1bff9ed349ff..c426dec6d579 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -2888,18 +2888,14 @@ static int ip_rt_acct_read(char *buffer, char **start, off_t offset, offset /= sizeof(u32); if (length > 0) { - u32 *src = ((u32 *) IP_RT_ACCT_CPU(0)) + offset; u32 *dst = (u32 *) buffer; - /* Copy first cpu. */ *start = buffer; - memcpy(dst, src, length); + memset(dst, 0, length); - /* Add the other cpus in, one int at a time */ for_each_possible_cpu(i) { unsigned int j; - - src = ((u32 *) IP_RT_ACCT_CPU(i)) + offset; + u32 *src = ((u32 *) IP_RT_ACCT_CPU(i)) + offset; for (j = 0; j < length/4; j++) dst[j] += src[j];