Merge tag 'iwlwifi-next-for-kalle-2016-07-01' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / net / sched / act_bpf.c

diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c
index c7123e0..f7b6cf4 100644 (file)
--- a/net/sched/act_bpf.c
+++ b/net/sched/act_bpf.c
@@ -154,10 +154,7 @@ static int tcf_bpf_dump(struct sk_buff *skb, struct tc_action *act,
        if (ret)
                goto nla_put_failure;
 
-       tm.install = jiffies_to_clock_t(jiffies - prog->tcf_tm.install);
-       tm.lastuse = jiffies_to_clock_t(jiffies - prog->tcf_tm.lastuse);
-       tm.expires = jiffies_to_clock_t(prog->tcf_tm.expires);
-
+       tcf_tm_dump(&tm, &prog->tcf_tm);
        if (nla_put_64bit(skb, TCA_ACT_BPF_TM, sizeof(tm), &tm,
                          TCA_ACT_BPF_PAD))
                goto nla_put_failure;
@@ -172,7 +169,8 @@ nla_put_failure:
 static const struct nla_policy act_bpf_policy[TCA_ACT_BPF_MAX + 1] = {
        [TCA_ACT_BPF_PARMS]     = { .len = sizeof(struct tc_act_bpf) },
        [TCA_ACT_BPF_FD]        = { .type = NLA_U32 },
-       [TCA_ACT_BPF_NAME]      = { .type = NLA_NUL_STRING, .len = ACT_BPF_NAME_LEN },
+       [TCA_ACT_BPF_NAME]      = { .type = NLA_NUL_STRING,
+                                   .len = ACT_BPF_NAME_LEN },
        [TCA_ACT_BPF_OPS_LEN]   = { .type = NLA_U16 },
        [TCA_ACT_BPF_OPS]       = { .type = NLA_BINARY,
                                    .len = sizeof(struct sock_filter) * BPF_MAXINSNS },