vserver 1.9.3

[linux-2.6.git] / net / sched / sch_dsmark.c

diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
index 92e9f33..28b61f0 100644 (file)
--- a/net/sched/sch_dsmark.c
+++ b/net/sched/sch_dsmark.c
@@ -30,7 +30,7 @@
 #endif
 
 
-#define PRIV(sch) ((struct dsmark_qdisc_data *) (sch)->data)
+#define PRIV(sch) qdisc_priv(sch)
 
 
 /*
@@ -331,8 +331,6 @@ int dsmark_init(struct Qdisc *sch,struct rtattr *opt)
            !tb[TCA_DSMARK_INDICES-1] ||
            RTA_PAYLOAD(tb[TCA_DSMARK_INDICES-1]) < sizeof(__u16))
                 return -EINVAL;
-       memset(p,0,sizeof(*p));
-       p->filter_list = NULL;
        p->indices = *(__u16 *) RTA_DATA(tb[TCA_DSMARK_INDICES-1]);
        if (!p->indices)
                return -EINVAL;
@@ -383,7 +381,6 @@ static void dsmark_destroy(struct Qdisc *sch)
                tcf_destroy(tp);
        }
        qdisc_destroy(p->q);
-       p->q = &noop_qdisc;
        kfree(p->mask);
 }