diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-08-16 09:36:49 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-17 21:33:49 -0700 |
commit | c1a8f1f1c8e01eab5862c8db39b49ace814e6c66 (patch) | |
tree | 0679f709f70d9a91850888636a28adb79940c402 /net/sched/sch_cbq.c | |
parent | c6ba973b8fa97422aab4204f7d79f1d413cde925 (diff) | |
download | op-kernel-dev-c1a8f1f1c8e01eab5862c8db39b49ace814e6c66.zip op-kernel-dev-c1a8f1f1c8e01eab5862c8db39b49ace814e6c66.tar.gz |
net: restore gnet_stats_basic to previous definition
In 5e140dfc1fe87eae27846f193086724806b33c7d "net: reorder struct Qdisc
for better SMP performance" the definition of struct gnet_stats_basic
changed incompatibly, as copies of this struct are shipped to
userland via netlink.
Restoring old behavior is not welcome, for performance reason.
Fix is to use a private structure for kernel, and
teach gnet_stats_copy_basic() to convert from kernel to user land,
using legacy structure (struct gnet_stats_basic)
Based on a report and initial patch from Michael Spang.
Reported-by: Michael Spang <mspang@csclub.uwaterloo.ca>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_cbq.c')
-rw-r--r-- | net/sched/sch_cbq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index 23a1676..d5798e1 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c @@ -128,7 +128,7 @@ struct cbq_class long avgidle; long deficit; /* Saved deficit for WRR */ psched_time_t penalized; - struct gnet_stats_basic bstats; + struct gnet_stats_basic_packed bstats; struct gnet_stats_queue qstats; struct gnet_stats_rate_est rate_est; struct tc_cbq_xstats xstats; |