Pull kmalloc into release branch

[powerpc.git] / net / sched / sch_dsmark.c

diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
index 13e0e7b..11c8a21 100644 (file)
--- a/net/sched/sch_dsmark.c
+++ b/net/sched/sch_dsmark.c
@@ -3,7 +3,6 @@
 /* Written 1998-2000 by Werner Almesberger, EPFL ICA */
 
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
@@ -438,6 +437,7 @@ static int dsmark_dump_class(struct Qdisc *sch, unsigned long cl,
                return -EINVAL;
 
        tcm->tcm_handle = TC_H_MAKE(TC_H_MAJ(sch->handle), cl-1);
+       tcm->tcm_info = p->q->handle;
 
        opts = RTA_NEST(skb, TCA_OPTIONS);
        RTA_PUT_U8(skb,TCA_DSMARK_MASK, p->mask[cl-1]);