Merge tag 'for-linus-3.11-merge-window-part-2' of git://git.kernel.org/pub/scm/linux...

[deliverable/linux.git] / net / sched / sch_cbq.c

diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index 1bc210ffcba2a524750b3382d444a87db2c08c2c..71a568862557c26cb9fd97bfbd26531b55ad4283 100644 (file)
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -130,7 +130,7 @@ struct cbq_class {
        psched_time_t           penalized;
        struct gnet_stats_basic_packed bstats;
        struct gnet_stats_queue qstats;
-       struct gnet_stats_rate_est rate_est;
+       struct gnet_stats_rate_est64 rate_est;
        struct tc_cbq_xstats    xstats;
 
        struct tcf_proto        *filter_list;