Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02c0fc1b authored by WANG Cong's avatar WANG Cong Committed by David S. Miller
Browse files

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 22e0f8b9 ("net: sched: make bstats per cpu and estimator RCU safe")
Reported-by: default avatarJoe Perches <joe@perches.com>
Cc: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7c5df8fa

net/core/gen_stats.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}

}