fat: fix VFAT_IOCTL_READDIR_xxx and cleanup for userland

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

diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index 1b9ca45a78e54a5d16ed0c91505d258766c7c1ce..d5f4e3404864eb7ffc70c3b7a79d425658e4ec53 100644 (file)
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -33,6 +33,10 @@ 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)
 {
@@ -47,12 +51,11 @@ static int tcf_pedit_init(struct nlattr *nla, struct nlattr *est,
        if (nla == NULL)
                return -EINVAL;
 
-       err = nla_parse_nested(tb, TCA_PEDIT_MAX, nla, NULL);
+       err = nla_parse_nested(tb, TCA_PEDIT_MAX, nla, pedit_policy);
        if (err < 0)
                return err;
 
-       if (tb[TCA_PEDIT_PARMS] == NULL ||
-           nla_len(tb[TCA_PEDIT_PARMS]) < sizeof(*parm))
+       if (tb[TCA_PEDIT_PARMS] == NULL)
                return -EINVAL;
        parm = nla_data(tb[TCA_PEDIT_PARMS]);
        ksize = parm->nkeys * sizeof(struct tc_pedit_key);
@@ -179,7 +182,7 @@ static int tcf_pedit(struct sk_buff *skb, struct tc_action *a,
 bad:
        p->tcf_qstats.overlimits++;
 done:
-       p->tcf_bstats.bytes += skb->len;
+       p->tcf_bstats.bytes += qdisc_pkt_len(skb);
        p->tcf_bstats.packets++;
        spin_unlock(&p->tcf_lock);
        return p->tcf_action;