diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-28 12:01:09 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-28 12:01:09 +0800 |
| commit | 6e49b7fa3083c30688b7fff1b37ed891cd1c30af (patch) | |
| tree | 3054864f2e58bcd86000567ce99e25753ddc794a /net/sched/act_gact.c | |
| parent | 2ba51c6d36ee1b43c1f898c6c48ddf3d33e9ab30 (diff) | |
| parent | be42cd02846a611af533103a3f4b6a7d8c592f49 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.9-rt' into linux-linaro-lsk-v4.9-rtlsk-v4.9-18.03-rt
Diffstat (limited to 'net/sched/act_gact.c')
| -rw-r--r-- | net/sched/act_gact.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c index e0aa30f83c6c..9617b42aaf20 100644 --- a/net/sched/act_gact.c +++ b/net/sched/act_gact.c @@ -161,7 +161,7 @@ static void tcf_gact_stats_update(struct tc_action *a, u64 bytes, u32 packets, if (action == TC_ACT_SHOT) this_cpu_ptr(gact->common.cpu_qstats)->drops += packets; - tm->lastuse = lastuse; + tm->lastuse = max_t(u64, tm->lastuse, lastuse); } static int tcf_gact_dump(struct sk_buff *skb, struct tc_action *a, |