arch/alpha: remove duplicate includes

[linux-2.6-omap-h63xx.git] / net / sched / sch_hfsc.c

diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index 4e6a164d3058fa3e46ff7850671b4b5cb1109ad5..87293d0db1d7fe1d64a162eefbc70c49278ffd6b 100644 (file)
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -986,6 +986,12 @@ hfsc_change_usc(struct hfsc_class *cl, struct tc_service_curve *usc,
        cl->cl_flags |= HFSC_USC;
 }
 
+static const struct nla_policy hfsc_policy[TCA_HFSC_MAX + 1] = {
+       [TCA_HFSC_RSC]  = { .len = sizeof(struct tc_service_curve) },
+       [TCA_HFSC_FSC]  = { .len = sizeof(struct tc_service_curve) },
+       [TCA_HFSC_USC]  = { .len = sizeof(struct tc_service_curve) },
+};
+
 static int
 hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
                  struct nlattr **tca, unsigned long *arg)
@@ -997,29 +1003,28 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
        struct nlattr *tb[TCA_HFSC_MAX + 1];
        struct tc_service_curve *rsc = NULL, *fsc = NULL, *usc = NULL;
        u64 cur_time;
+       int err;
 
-       if (opt == NULL || nla_parse_nested(tb, TCA_HFSC_MAX, opt, NULL))
+       if (opt == NULL)
                return -EINVAL;
 
+       err = nla_parse_nested(tb, TCA_HFSC_MAX, opt, hfsc_policy);
+       if (err < 0)
+               return err;
+
        if (tb[TCA_HFSC_RSC]) {
-               if (nla_len(tb[TCA_HFSC_RSC]) < sizeof(*rsc))
-                       return -EINVAL;
                rsc = nla_data(tb[TCA_HFSC_RSC]);
                if (rsc->m1 == 0 && rsc->m2 == 0)
                        rsc = NULL;
        }
 
        if (tb[TCA_HFSC_FSC]) {
-               if (nla_len(tb[TCA_HFSC_FSC]) < sizeof(*fsc))
-                       return -EINVAL;
                fsc = nla_data(tb[TCA_HFSC_FSC]);
                if (fsc->m1 == 0 && fsc->m2 == 0)
                        fsc = NULL;
        }
 
        if (tb[TCA_HFSC_USC]) {
-               if (nla_len(tb[TCA_HFSC_USC]) < sizeof(*usc))
-                       return -EINVAL;
                usc = nla_data(tb[TCA_HFSC_USC]);
                if (usc->m1 == 0 && usc->m2 == 0)
                        usc = NULL;
@@ -1338,22 +1343,23 @@ hfsc_dump_class(struct Qdisc *sch, unsigned long arg, struct sk_buff *skb,
                struct tcmsg *tcm)
 {
        struct hfsc_class *cl = (struct hfsc_class *)arg;
-       unsigned char *b = skb_tail_pointer(skb);
-       struct nlattr *nla = (struct nlattr *)b;
+       struct nlattr *nest;
 
        tcm->tcm_parent = cl->cl_parent ? cl->cl_parent->classid : TC_H_ROOT;
        tcm->tcm_handle = cl->classid;
        if (cl->level == 0)
                tcm->tcm_info = cl->qdisc->handle;
 
-       NLA_PUT(skb, TCA_OPTIONS, 0, NULL);
+       nest = nla_nest_start(skb, TCA_OPTIONS);
+       if (nest == NULL)
+               goto nla_put_failure;
        if (hfsc_dump_curves(skb, cl) < 0)
                goto nla_put_failure;
-       nla->nla_len = skb_tail_pointer(skb) - b;
+       nla_nest_end(skb, nest);
        return skb->len;
 
  nla_put_failure:
-       nlmsg_trim(skb, b);
+       nla_nest_cancel(skb, nest);
        return -1;
 }