From: Jamal Hadi Salim Date: Sat, 2 Jul 2016 10:43:16 +0000 (-0400) Subject: net sched actions: skbedit convert to use more modern nla_put_xxx X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=61cc535de36838bf4cfe08c8c4eeaad1ca4a89b1;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git net sched actions: skbedit convert to use more modern nla_put_xxx Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller --- diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c index 1c4c9240a3f8..8e573c0f8742 100644 --- a/net/sched/act_skbedit.c +++ b/net/sched/act_skbedit.c @@ -170,20 +170,16 @@ static int tcf_skbedit_dump(struct sk_buff *skb, struct tc_action *a, if (nla_put(skb, TCA_SKBEDIT_PARMS, sizeof(opt), &opt)) goto nla_put_failure; if ((d->flags & SKBEDIT_F_PRIORITY) && - nla_put(skb, TCA_SKBEDIT_PRIORITY, sizeof(d->priority), - &d->priority)) + nla_put_u32(skb, TCA_SKBEDIT_PRIORITY, d->priority)) goto nla_put_failure; if ((d->flags & SKBEDIT_F_QUEUE_MAPPING) && - nla_put(skb, TCA_SKBEDIT_QUEUE_MAPPING, - sizeof(d->queue_mapping), &d->queue_mapping)) + nla_put_u16(skb, TCA_SKBEDIT_QUEUE_MAPPING, d->queue_mapping)) goto nla_put_failure; if ((d->flags & SKBEDIT_F_MARK) && - nla_put(skb, TCA_SKBEDIT_MARK, sizeof(d->mark), - &d->mark)) + nla_put_u32(skb, TCA_SKBEDIT_MARK, d->mark)) goto nla_put_failure; if ((d->flags & SKBEDIT_F_PTYPE) && - nla_put(skb, TCA_SKBEDIT_PTYPE, sizeof(d->ptype), - &d->ptype)) + nla_put_u16(skb, TCA_SKBEDIT_PTYPE, d->ptype)) goto nla_put_failure; tcf_tm_dump(&t, &d->tcf_tm);