Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

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

diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c
index 0cafdd5..3a9d226 100644 (file)
--- a/net/sched/sch_gred.c
+++ b/net/sched/sch_gred.c
@@ -21,7 +21,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <net/pkt_sched.h>
 #include <net/red.h>
@@ -335,7 +334,7 @@ static void gred_reset(struct Qdisc* sch)
 
        qdisc_reset_queue(sch);
 
-        for (i = 0; i < t->DPs; i++) {
+       for (i = 0; i < t->DPs; i++) {
                struct gred_sched_data *q = t->tab[i];
 
                if (!q)
@@ -351,16 +350,16 @@ static inline void gred_destroy_vq(struct gred_sched_data *q)
        kfree(q);
 }
 
-static inline int gred_change_table_def(struct Qdisc *sch, struct rtattr *dps)
+static inline int gred_change_table_def(struct Qdisc *sch, struct nlattr *dps)
 {
        struct gred_sched *table = qdisc_priv(sch);
        struct tc_gred_sopt *sopt;
        int i;
 
-       if (dps == NULL || RTA_PAYLOAD(dps) < sizeof(*sopt))
+       if (dps == NULL)
                return -EINVAL;
 
-       sopt = RTA_DATA(dps);
+       sopt = nla_data(dps);
 
        if (sopt->DPs > MAX_DPs || sopt->DPs == 0 || sopt->def_DP >= sopt->DPs)
                return -EINVAL;
@@ -393,7 +392,7 @@ static inline int gred_change_table_def(struct Qdisc *sch, struct rtattr *dps)
                               "shadowed VQ 0x%x\n", i);
                        gred_destroy_vq(table->tab[i]);
                        table->tab[i] = NULL;
-               }
+               }
        }
 
        return 0;
@@ -406,10 +405,9 @@ static inline int gred_change_vq(struct Qdisc *sch, int dp,
        struct gred_sched_data *q;
 
        if (table->tab[dp] == NULL) {
-               table->tab[dp] = kmalloc(sizeof(*q), GFP_KERNEL);
+               table->tab[dp] = kzalloc(sizeof(*q), GFP_KERNEL);
                if (table->tab[dp] == NULL)
                        return -ENOMEM;
-               memset(table->tab[dp], 0, sizeof(*q));
        }
 
        q = table->tab[dp];
@@ -427,28 +425,37 @@ static inline int gred_change_vq(struct Qdisc *sch, int dp,
        return 0;
 }
 
-static int gred_change(struct Qdisc *sch, struct rtattr *opt)
+static const struct nla_policy gred_policy[TCA_GRED_MAX + 1] = {
+       [TCA_GRED_PARMS]        = { .len = sizeof(struct tc_gred_qopt) },
+       [TCA_GRED_STAB]         = { .len = 256 },
+       [TCA_GRED_DPS]          = { .len = sizeof(struct tc_gred_sopt) },
+};
+
+static int gred_change(struct Qdisc *sch, struct nlattr *opt)
 {
        struct gred_sched *table = qdisc_priv(sch);
        struct tc_gred_qopt *ctl;
-       struct rtattr *tb[TCA_GRED_MAX];
-       int err = -EINVAL, prio = GRED_DEF_PRIO;
+       struct nlattr *tb[TCA_GRED_MAX + 1];
+       int err, prio = GRED_DEF_PRIO;
        u8 *stab;
 
-       if (opt == NULL || rtattr_parse_nested(tb, TCA_GRED_MAX, opt))
+       if (opt == NULL)
                return -EINVAL;
 
-       if (tb[TCA_GRED_PARMS-1] == NULL && tb[TCA_GRED_STAB-1] == NULL)
+       err = nla_parse_nested(tb, TCA_GRED_MAX, opt, gred_policy);
+       if (err < 0)
+               return err;
+
+       if (tb[TCA_GRED_PARMS] == NULL && tb[TCA_GRED_STAB] == NULL)
                return gred_change_table_def(sch, opt);
 
-       if (tb[TCA_GRED_PARMS-1] == NULL ||
-           RTA_PAYLOAD(tb[TCA_GRED_PARMS-1]) < sizeof(*ctl) ||
-           tb[TCA_GRED_STAB-1] == NULL ||
-           RTA_PAYLOAD(tb[TCA_GRED_STAB-1]) < 256)
+       if (tb[TCA_GRED_PARMS] == NULL ||
+           tb[TCA_GRED_STAB] == NULL)
                return -EINVAL;
 
-       ctl = RTA_DATA(tb[TCA_GRED_PARMS-1]);
-       stab = RTA_DATA(tb[TCA_GRED_STAB-1]);
+       err = -EINVAL;
+       ctl = nla_data(tb[TCA_GRED_PARMS]);
+       stab = nla_data(tb[TCA_GRED_STAB]);
 
        if (ctl->DP >= table->DPs)
                goto errout;
@@ -488,23 +495,28 @@ errout:
        return err;
 }
 
-static int gred_init(struct Qdisc *sch, struct rtattr *opt)
+static int gred_init(struct Qdisc *sch, struct nlattr *opt)
 {
-       struct rtattr *tb[TCA_GRED_MAX];
+       struct nlattr *tb[TCA_GRED_MAX + 1];
+       int err;
 
-       if (opt == NULL || rtattr_parse_nested(tb, TCA_GRED_MAX, opt))
+       if (opt == NULL)
                return -EINVAL;
 
-       if (tb[TCA_GRED_PARMS-1] || tb[TCA_GRED_STAB-1])
+       err = nla_parse_nested(tb, TCA_GRED_MAX, opt, gred_policy);
+       if (err < 0)
+               return err;
+
+       if (tb[TCA_GRED_PARMS] || tb[TCA_GRED_STAB])
                return -EINVAL;
 
-       return gred_change_table_def(sch, tb[TCA_GRED_DPS-1]);
+       return gred_change_table_def(sch, tb[TCA_GRED_DPS]);
 }
 
 static int gred_dump(struct Qdisc *sch, struct sk_buff *skb)
 {
        struct gred_sched *table = qdisc_priv(sch);
-       struct rtattr *parms, *opts = NULL;
+       struct nlattr *parms, *opts = NULL;
        int i;
        struct tc_gred_sopt sopt = {
                .DPs    = table->DPs,
@@ -513,9 +525,13 @@ static int gred_dump(struct Qdisc *sch, struct sk_buff *skb)
                .flags  = table->red_flags,
        };
 
-       opts = RTA_NEST(skb, TCA_OPTIONS);
-       RTA_PUT(skb, TCA_GRED_DPS, sizeof(sopt), &sopt);
-       parms = RTA_NEST(skb, TCA_GRED_PARMS);
+       opts = nla_nest_start(skb, TCA_OPTIONS);
+       if (opts == NULL)
+               goto nla_put_failure;
+       NLA_PUT(skb, TCA_GRED_DPS, sizeof(sopt), &sopt);
+       parms = nla_nest_start(skb, TCA_GRED_PARMS);
+       if (parms == NULL)
+               goto nla_put_failure;
 
        for (i = 0; i < MAX_DPs; i++) {
                struct gred_sched_data *q = table->tab[i];
@@ -557,15 +573,16 @@ static int gred_dump(struct Qdisc *sch, struct sk_buff *skb)
                opt.qave = red_calc_qavg(&q->parms, q->parms.qavg);
 
 append_opt:
-               RTA_APPEND(skb, sizeof(opt), &opt);
+               if (nla_append(skb, sizeof(opt), &opt) < 0)
+                       goto nla_put_failure;
        }
 
-       RTA_NEST_END(skb, parms);
+       nla_nest_end(skb, parms);
 
-       return RTA_NEST_END(skb, opts);
+       return nla_nest_end(skb, opts);
 
-rtattr_failure:
-       return RTA_NEST_CANCEL(skb, opts);
+nla_put_failure:
+       return nla_nest_cancel(skb, opts);
 }
 
 static void gred_destroy(struct Qdisc *sch)
@@ -579,7 +596,7 @@ static void gred_destroy(struct Qdisc *sch)
        }
 }
 
-static struct Qdisc_ops gred_qdisc_ops = {
+static struct Qdisc_ops gred_qdisc_ops __read_mostly = {
        .id             =       "gred",
        .priv_size      =       sizeof(struct gred_sched),
        .enqueue        =       gred_enqueue,