diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2014-10-07 02:01:33 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-07 06:10:49 +0200 |
| commit | 02c0fc1b8f41e6e895d6573615ba8ff549b685d2 (patch) | |
| tree | e3fdb0296ca14cbff970df355798c7bbf75681d8 /net | |
| parent | openvswitch: fix a compilation error when CONFIG_INET is not setW! (diff) | |
| download | linux-02c0fc1b8f41e6e895d6573615ba8ff549b685d2.tar.xz linux-02c0fc1b8f41e6e895d6573615ba8ff549b685d2.zip | |
net_sched: fix unused variables in __gnet_stats_copy_basic_cpu()
Probably not a big deal, but we'd better just use the
one we get in retry loop.
Fixes: commit 22e0f8b9322cb1a48b1357e8 ("net: sched: make bstats per cpu and estimator RCU safe")
Reported-by: Joe Perches <joe@perches.com>
Cc: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/gen_stats.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/core/gen_stats.c b/net/core/gen_stats.c index 14681b97a4f3..0c08062d1796 100644 --- a/net/core/gen_stats.c +++ b/net/core/gen_stats.c @@ -106,8 +106,8 @@ __gnet_stats_copy_basic_cpu(struct gnet_stats_basic_packed *bstats, for_each_possible_cpu(i) { struct gnet_stats_basic_cpu *bcpu = per_cpu_ptr(cpu, i); unsigned int start; - __u64 bytes; - __u32 packets; + u64 bytes; + u32 packets; do { start = u64_stats_fetch_begin_irq(&bcpu->syncp); @@ -115,8 +115,8 @@ __gnet_stats_copy_basic_cpu(struct gnet_stats_basic_packed *bstats, packets = bcpu->bstats.packets; } while (u64_stats_fetch_retry_irq(&bcpu->syncp, start)); - bstats->bytes += bcpu->bstats.bytes; - bstats->packets += bcpu->bstats.packets; + bstats->bytes += bytes; + bstats->packets += packets; } } |