9p: add remove function to trans_virtio

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

diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index 88d8a15..3cc4cb9 100644 (file)
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -33,22 +33,29 @@ static struct tcf_hashinfo pedit_hash_info = {
        .lock   =       &pedit_lock,
 };
 
+static const struct nla_policy pedit_policy[TCA_PEDIT_MAX + 1] = {
+       [TCA_PEDIT_PARMS]       = { .len = sizeof(struct tcf_pedit) },
+};
+
 static int tcf_pedit_init(struct nlattr *nla, struct nlattr *est,
                          struct tc_action *a, int ovr, int bind)
 {
        struct nlattr *tb[TCA_PEDIT_MAX + 1];
        struct tc_pedit *parm;
-       int ret = 0;
+       int ret = 0, err;
        struct tcf_pedit *p;
        struct tcf_common *pc;
        struct tc_pedit_key *keys = NULL;
        int ksize;
 
-       if (nla == NULL || nla_parse_nested(tb, TCA_PEDIT_MAX, nla, NULL) < 0)
+       if (nla == NULL)
                return -EINVAL;
 
-       if (tb[TCA_PEDIT_PARMS] == NULL ||
-           nla_len(tb[TCA_PEDIT_PARMS]) < sizeof(*parm))
+       err = nla_parse_nested(tb, TCA_PEDIT_MAX, nla, pedit_policy);
+       if (err < 0)
+               return err;
+
+       if (tb[TCA_PEDIT_PARMS] == NULL)
                return -EINVAL;
        parm = nla_data(tb[TCA_PEDIT_PARMS]);
        ksize = parm->nkeys * sizeof(struct tc_pedit_key);