2.6.25-rc7

 net

 sched

diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index 8dbcf27..956915c 100644
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@ -35,7 +35,7 @@ struct basic_filter
    struct list_head   link;
 };
 
-static struct tcf_ext_map basic_ext_map = {
+static const struct tcf_ext_map basic_ext_map = {
    .action = TCA_BASIC_ACT,
    .police = TCA_BASIC_POLICE
 };
@@ -129,28 +129,29 @@ static int basic_delete(struct tcf_proto *tp, unsigned long arg)
    return -ENOENT;
 }
 
+static const struct nla_policy basic_policy[TCA_BASIC_MAX + 1] = {
+   [TCA_BASIC_CLASSID]   = { .type = NLA_U32 },
+   [TCA_BASIC_EMATCHES]   = { .type = NLA_NESTED },
+};
+
 static inline int basic_set_parms(struct tcf_proto *tp, struct basic_filter *f,
-              unsigned long base, struct rtattr **tb,
-              struct rtattr *est)
+              unsigned long base, struct nlattr **tb,
+              struct nlattr *est)
 {
    int err = -EINVAL;
    struct tcf_exts e;
    struct tcf_ematch_tree t;
 
-   if (tb[TCA_BASIC_CLASSID-1])
-      if (RTA_PAYLOAD(tb[TCA_BASIC_CLASSID-1]) < sizeof(u32))
-         return err;
-
    err = tcf_exts_validate(tp, tb, est, &e, &basic_ext_map);
    if (err < 0)
       return err;
 
-   err = tcf_em_tree_validate(tp, tb[TCA_BASIC_EMATCHES-1], &t);
+   err = tcf_em_tree_validate(tp, tb[TCA_BASIC_EMATCHES], &t);
    if (err < 0)
       goto errout;
 
-   if (tb[TCA_BASIC_CLASSID-1]) {
-      f->res.classid = *(u32*)RTA_DATA(tb[TCA_BASIC_CLASSID-1]);
+   if (tb[TCA_BASIC_CLASSID]) {
+      f->res.classid = nla_get_u32(tb[TCA_BASIC_CLASSID]);
       tcf_bind_filter(tp, &f->res, base);
    }
 
@@ -164,23 +165,25 @@ errout:
 }
 
 static int basic_change(struct tcf_proto *tp, unsigned long base, u32 handle,
-         struct rtattr **tca, unsigned long *arg)
+         struct nlattr **tca, unsigned long *arg)
 {
-   int err = -EINVAL;
+   int err;
    struct basic_head *head = (struct basic_head *) tp->root;
-   struct rtattr *tb[TCA_BASIC_MAX];
+   struct nlattr *tb[TCA_BASIC_MAX + 1];
    struct basic_filter *f = (struct basic_filter *) *arg;
 
-   if (tca[TCA_OPTIONS-1] == NULL)
+   if (tca[TCA_OPTIONS] == NULL)
       return -EINVAL;
 
-   if (rtattr_parse_nested(tb, TCA_BASIC_MAX, tca[TCA_OPTIONS-1]) < 0)
-      return -EINVAL;
+   err = nla_parse_nested(tb, TCA_BASIC_MAX, tca[TCA_OPTIONS],
+                basic_policy);
+   if (err < 0)
+      return err;
 
    if (f != NULL) {
       if (handle && f->handle != handle)
          return -EINVAL;
-      return basic_set_parms(tp, f, base, tb, tca[TCA_RATE-1]);
+      return basic_set_parms(tp, f, base, tb, tca[TCA_RATE]);
    }
 
    err = -ENOBUFS;
@@ -206,7 +209,7 @@ static int basic_change(struct tcf_proto *tp, unsigned long base, u32 handle,
       f->handle = head->hgenerator;
    }
 
-   err = basic_set_parms(tp, f, base, tb, tca[TCA_RATE-1]);
+   err = basic_set_parms(tp, f, base, tb, tca[TCA_RATE]);
    if (err < 0)
       goto errout;
 
@@ -245,33 +248,33 @@ static int basic_dump(struct tcf_proto *tp, unsigned long fh,
             struct sk_buff *skb, struct tcmsg *t)
 {
    struct basic_filter *f = (struct basic_filter *) fh;
-   unsigned char *b = skb_tail_pointer(skb);
-   struct rtattr *rta;
+   struct nlattr *nest;
 
    if (f == NULL)
       return skb->len;
 
    t->tcm_handle = f->handle;
 
-   rta = (struct rtattr *) b;
-   RTA_PUT(skb, TCA_OPTIONS, 0, NULL);
+   nest = nla_nest_start(skb, TCA_OPTIONS);
+   if (nest == NULL)
+      goto nla_put_failure;
 
    if (f->res.classid)
-      RTA_PUT(skb, TCA_BASIC_CLASSID, sizeof(u32), &f->res.classid);
+      NLA_PUT_U32(skb, TCA_BASIC_CLASSID, f->res.classid);
 
    if (tcf_exts_dump(skb, &f->exts, &basic_ext_map) < 0 ||
        tcf_em_tree_dump(skb, &f->ematches, TCA_BASIC_EMATCHES) < 0)
-      goto rtattr_failure;
+      goto nla_put_failure;
 
-   rta->rta_len = skb_tail_pointer(skb) - b;
+   nla_nest_end(skb, nest);
    return skb->len;
 
-rtattr_failure:
-   nlmsg_trim(skb, b);
+nla_put_failure:
+   nla_nest_cancel(skb, nest);
    return -1;
 }
 
-static struct tcf_proto_ops cls_basic_ops = {
+static struct tcf_proto_ops cls_basic_ops __read_mostly = {
    .kind      =   "basic",
    .classify   =   basic_classify,
    .init      =   basic_init,