Merge master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6] / net / sched / sch_cbq.c

diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index baeb3111f75e472e6014766cd9cbc280dfe374c7..09453f997d8c3a0081e10d37066953060feafc94 100644 (file)
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -1528,6 +1528,7 @@ static __inline__ int cbq_dump_ovl(struct sk_buff *skb, struct cbq_class *cl)
 
        opt.strategy = cl->ovl_strategy;
        opt.priority2 = cl->priority2+1;
+       opt.pad = 0;
        opt.penalty = (cl->penalty*1000)/HZ;
        RTA_PUT(skb, TCA_CBQ_OVL_STRATEGY, sizeof(opt), &opt);
        return skb->len;