[NET_SCHED]: Convert packet schedulers from rtnetlink to new netlink API

[safe/jmp/linux-2.6] / net / sched / sch_red.c

diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c
index 00db53e..6ce8da5 100644 (file)
--- a/net/sched/sch_red.c
+++ b/net/sched/sch_red.c
@@ -17,7 +17,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/inet_ecn.h>
@@ -178,21 +177,21 @@ static void red_destroy(struct Qdisc *sch)
 static struct Qdisc *red_create_dflt(struct Qdisc *sch, u32 limit)
 {
        struct Qdisc *q;
-       struct rtattr *rta;
+       struct nlattr *nla;
        int ret;
 
        q = qdisc_create_dflt(sch->dev, &bfifo_qdisc_ops,
                              TC_H_MAKE(sch->handle, 1));
        if (q) {
-               rta = kmalloc(RTA_LENGTH(sizeof(struct tc_fifo_qopt)),
+               nla = kmalloc(nla_attr_size(sizeof(struct tc_fifo_qopt)),
                              GFP_KERNEL);
-               if (rta) {
-                       rta->rta_type = RTM_NEWQDISC;
-                       rta->rta_len = RTA_LENGTH(sizeof(struct tc_fifo_qopt));
-                       ((struct tc_fifo_qopt *)RTA_DATA(rta))->limit = limit;
+               if (nla) {
+                       nla->nla_type = RTM_NEWQDISC;
+                       nla->nla_len = nla_attr_size(sizeof(struct tc_fifo_qopt));
+                       ((struct tc_fifo_qopt *)nla_data(nla))->limit = limit;
 
-                       ret = q->ops->change(q, rta);
-                       kfree(rta);
+                       ret = q->ops->change(q, nla);
+                       kfree(nla);
 
                        if (ret == 0)
                                return q;
@@ -202,23 +201,23 @@ static struct Qdisc *red_create_dflt(struct Qdisc *sch, u32 limit)
        return NULL;
 }
 
-static int red_change(struct Qdisc *sch, struct rtattr *opt)
+static int red_change(struct Qdisc *sch, struct nlattr *opt)
 {
        struct red_sched_data *q = qdisc_priv(sch);
-       struct rtattr *tb[TCA_RED_MAX];
+       struct nlattr *tb[TCA_RED_MAX + 1];
        struct tc_red_qopt *ctl;
        struct Qdisc *child = NULL;
 
-       if (opt == NULL || rtattr_parse_nested(tb, TCA_RED_MAX, opt))
+       if (opt == NULL || nla_parse_nested(tb, TCA_RED_MAX, opt, NULL))
                return -EINVAL;
 
-       if (tb[TCA_RED_PARMS-1] == NULL ||
-           RTA_PAYLOAD(tb[TCA_RED_PARMS-1]) < sizeof(*ctl) ||
-           tb[TCA_RED_STAB-1] == NULL ||
-           RTA_PAYLOAD(tb[TCA_RED_STAB-1]) < RED_STAB_SIZE)
+       if (tb[TCA_RED_PARMS] == NULL ||
+           nla_len(tb[TCA_RED_PARMS]) < sizeof(*ctl) ||
+           tb[TCA_RED_STAB] == NULL ||
+           nla_len(tb[TCA_RED_STAB]) < RED_STAB_SIZE)
                return -EINVAL;
 
-       ctl = RTA_DATA(tb[TCA_RED_PARMS-1]);
+       ctl = nla_data(tb[TCA_RED_PARMS]);
 
        if (ctl->limit > 0) {
                child = red_create_dflt(sch, ctl->limit);
@@ -236,7 +235,7 @@ static int red_change(struct Qdisc *sch, struct rtattr *opt)
 
        red_set_parms(&q->parms, ctl->qth_min, ctl->qth_max, ctl->Wlog,
                                 ctl->Plog, ctl->Scell_log,
-                                RTA_DATA(tb[TCA_RED_STAB-1]));
+                                nla_data(tb[TCA_RED_STAB]));
 
        if (skb_queue_empty(&sch->q))
                red_end_of_idle_period(&q->parms);
@@ -245,7 +244,7 @@ static int red_change(struct Qdisc *sch, struct rtattr *opt)
        return 0;
 }
 
-static int red_init(struct Qdisc* sch, struct rtattr *opt)
+static int red_init(struct Qdisc* sch, struct nlattr *opt)
 {
        struct red_sched_data *q = qdisc_priv(sch);
 
@@ -256,7 +255,7 @@ static int red_init(struct Qdisc* sch, struct rtattr *opt)
 static int red_dump(struct Qdisc *sch, struct sk_buff *skb)
 {
        struct red_sched_data *q = qdisc_priv(sch);
-       struct rtattr *opts = NULL;
+       struct nlattr *opts = NULL;
        struct tc_red_qopt opt = {
                .limit          = q->limit,
                .flags          = q->flags,
@@ -267,12 +266,14 @@ static int red_dump(struct Qdisc *sch, struct sk_buff *skb)
                .Scell_log      = q->parms.Scell_log,
        };
 
-       opts = RTA_NEST(skb, TCA_OPTIONS);
-       RTA_PUT(skb, TCA_RED_PARMS, sizeof(opt), &opt);
-       return RTA_NEST_END(skb, opts);
+       opts = nla_nest_start(skb, TCA_OPTIONS);
+       if (opts == NULL)
+               goto nla_put_failure;
+       NLA_PUT(skb, TCA_RED_PARMS, sizeof(opt), &opt);
+       return nla_nest_end(skb, opts);
 
-rtattr_failure:
-       return RTA_NEST_CANCEL(skb, opts);
+nla_put_failure:
+       return nla_nest_cancel(skb, opts);
 }
 
 static int red_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
@@ -333,7 +334,7 @@ static void red_put(struct Qdisc *sch, unsigned long arg)
 }
 
 static int red_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
-                           struct rtattr **tca, unsigned long *arg)
+                           struct nlattr **tca, unsigned long *arg)
 {
        return -ENOSYS;
 }
@@ -360,7 +361,7 @@ static struct tcf_proto **red_find_tcf(struct Qdisc *sch, unsigned long cl)
        return NULL;
 }
 
-static struct Qdisc_class_ops red_class_ops = {
+static const struct Qdisc_class_ops red_class_ops = {
        .graft          =       red_graft,
        .leaf           =       red_leaf,
        .get            =       red_get,
@@ -372,7 +373,7 @@ static struct Qdisc_class_ops red_class_ops = {
        .dump           =       red_dump_class,
 };
 
-static struct Qdisc_ops red_qdisc_ops = {
+static struct Qdisc_ops red_qdisc_ops __read_mostly = {
        .id             =       "red",
        .priv_size      =       sizeof(struct red_sched_data),
        .cl_ops         =       &red_class_ops,