]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - net/sched/act_nat.c
[SCSI] Update the SCSI state model to allow blocking in the created state
[linux-2.6-omap-h63xx.git] / net / sched / act_nat.c
index be007bb31b59be92c09388eca2de1910e2ebb025..7b39ed485bca0beeb44da1572ff053ed61395d5f 100644 (file)
@@ -40,20 +40,27 @@ static struct tcf_hashinfo nat_hash_info = {
        .lock   =       &nat_lock,
 };
 
+static const struct nla_policy nat_policy[TCA_NAT_MAX + 1] = {
+       [TCA_NAT_PARMS] = { .len = sizeof(struct tc_nat) },
+};
+
 static int tcf_nat_init(struct nlattr *nla, struct nlattr *est,
                        struct tc_action *a, int ovr, int bind)
 {
        struct nlattr *tb[TCA_NAT_MAX + 1];
        struct tc_nat *parm;
-       int ret = 0;
+       int ret = 0, err;
        struct tcf_nat *p;
        struct tcf_common *pc;
 
-       if (nla == NULL || nla_parse_nested(tb, TCA_NAT_MAX, nla, NULL) < 0)
+       if (nla == NULL)
                return -EINVAL;
 
-       if (tb[TCA_NAT_PARMS] == NULL ||
-           nla_len(tb[TCA_NAT_PARMS]) < sizeof(*parm))
+       err = nla_parse_nested(tb, TCA_NAT_MAX, nla, nat_policy);
+       if (err < 0)
+               return err;
+
+       if (tb[TCA_NAT_PARMS] == NULL)
                return -EINVAL;
        parm = nla_data(tb[TCA_NAT_PARMS]);
 
@@ -117,7 +124,7 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
        egress = p->flags & TCA_NAT_FLAG_EGRESS;
        action = p->tcf_action;
 
-       p->tcf_bstats.bytes += skb->len;
+       p->tcf_bstats.bytes += qdisc_pkt_len(skb);
        p->tcf_bstats.packets++;
 
        spin_unlock(&p->tcf_lock);