* [Patch net-next] net_sched: fix unused variables in __gnet_stats_copy_basic_cpu()
@ 2014-10-07 0:01 Cong Wang
2014-10-07 4:12 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Cong Wang @ 2014-10-07 0:01 UTC (permalink / raw)
To: netdev; +Cc: Cong Wang, John Fastabend
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>
---
net/core/gen_stats.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/core/gen_stats.c b/net/core/gen_stats.c
index 14681b9..0c08062 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;
}
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Patch net-next] net_sched: fix unused variables in __gnet_stats_copy_basic_cpu()
2014-10-07 0:01 [Patch net-next] net_sched: fix unused variables in __gnet_stats_copy_basic_cpu() Cong Wang
@ 2014-10-07 4:12 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-10-07 4:12 UTC (permalink / raw)
To: xiyou.wangcong; +Cc: netdev, john.fastabend
From: Cong Wang <xiyou.wangcong@gmail.com>
Date: Mon, 6 Oct 2014 17:01:33 -0700
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-07 4:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-07 0:01 [Patch net-next] net_sched: fix unused variables in __gnet_stats_copy_basic_cpu() Cong Wang
2014-10-07 4:12 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).