diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-06-07 15:53:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-07 15:53:44 -0700 |
| commit | be119913689724b6fe84caa779c2508547c4e8d5 (patch) | |
| tree | 175c3ca36e719394ab7f882e2030d0c55b4487c8 /net/sched/act_bpf.c | |
| parent | net/sched: cls_flower: Introduce support in SKIP SW flag (diff) | |
| parent | net sched actions: aggregate dumping of actions timeinfo (diff) | |
| download | linux-dev-be119913689724b6fe84caa779c2508547c4e8d5.tar.xz linux-dev-be119913689724b6fe84caa779c2508547c4e8d5.zip | |
Merge branch 'sch-action-tstamp'
Jamal Hadi Salim says:
====================
net sched action timestamp improvements
Various aggregations of duplicated code, fixes and introduction of firstused
timestamp
v2: add const for source time info per suggestion from Cong
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/sched/act_bpf.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c index c7123e01c2ca..ae0e7cbe488c 100644 --- 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; |