Skip to content

Commit

Permalink
net sched: actions use tcf_lastuse_update for consistency
Browse files Browse the repository at this point in the history
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jamal Hadi Salim authored and David S. Miller committed Jun 7, 2016
1 parent e69985c commit 9c4a4e4
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion net/sched/act_connmark.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
int proto;

spin_lock(&ca->tcf_lock);
ca->tcf_tm.lastuse = jiffies;
tcf_lastuse_update(&ca->tcf_tm);
bstats_update(&ca->tcf_bstats, skb);

if (skb->protocol == htons(ETH_P_IP)) {
Expand Down
2 changes: 1 addition & 1 deletion net/sched/act_csum.c
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ static int tcf_csum(struct sk_buff *skb,
u32 update_flags;

spin_lock(&p->tcf_lock);
p->tcf_tm.lastuse = jiffies;
tcf_lastuse_update(&p->tcf_tm);
bstats_update(&p->tcf_bstats, skb);
action = p->tcf_action;
update_flags = p->update_flags;
Expand Down
6 changes: 3 additions & 3 deletions net/sched/act_ife.c
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ static int tcf_ife_decode(struct sk_buff *skb, const struct tc_action *a,

spin_lock(&ife->tcf_lock);
bstats_update(&ife->tcf_bstats, skb);
ife->tcf_tm.lastuse = jiffies;
tcf_lastuse_update(&ife->tcf_tm);
spin_unlock(&ife->tcf_lock);

ifehdrln = ntohs(ifehdrln);
Expand Down Expand Up @@ -711,7 +711,7 @@ static int tcf_ife_encode(struct sk_buff *skb, const struct tc_action *a,

spin_lock(&ife->tcf_lock);
bstats_update(&ife->tcf_bstats, skb);
ife->tcf_tm.lastuse = jiffies;
tcf_lastuse_update(&ife->tcf_tm);

if (!metalen) { /* no metadata to send */
/* abuse overlimits to count when we allow packet
Expand Down Expand Up @@ -802,7 +802,7 @@ static int tcf_ife_act(struct sk_buff *skb, const struct tc_action *a,
pr_info_ratelimited("unknown failure(policy neither de/encode\n");
spin_lock(&ife->tcf_lock);
bstats_update(&ife->tcf_bstats, skb);
ife->tcf_tm.lastuse = jiffies;
tcf_lastuse_update(&ife->tcf_tm);
ife->tcf_qstats.drops++;
spin_unlock(&ife->tcf_lock);

Expand Down
2 changes: 1 addition & 1 deletion net/sched/act_ipt.c
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ static int tcf_ipt(struct sk_buff *skb, const struct tc_action *a,

spin_lock(&ipt->tcf_lock);

ipt->tcf_tm.lastuse = jiffies;
tcf_lastuse_update(&ipt->tcf_tm);
bstats_update(&ipt->tcf_bstats, skb);

/* yes, we have to worry about both in and out dev
Expand Down
1 change: 0 additions & 1 deletion net/sched/act_mirred.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ static int tcf_mirred(struct sk_buff *skb, const struct tc_action *a,
u32 at;

tcf_lastuse_update(&m->tcf_tm);

bstats_cpu_update(this_cpu_ptr(m->common.cpu_bstats), skb);

rcu_read_lock();
Expand Down
2 changes: 1 addition & 1 deletion net/sched/act_nat.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ static int tcf_nat(struct sk_buff *skb, const struct tc_action *a,

spin_lock(&p->tcf_lock);

p->tcf_tm.lastuse = jiffies;
tcf_lastuse_update(&p->tcf_tm);
old_addr = p->old_addr;
new_addr = p->new_addr;
mask = p->mask;
Expand Down
2 changes: 1 addition & 1 deletion net/sched/act_pedit.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,

spin_lock(&p->tcf_lock);

p->tcf_tm.lastuse = jiffies;
tcf_lastuse_update(&p->tcf_tm);

if (p->tcfp_nkeys > 0) {
struct tc_pedit_key *tkey = p->tcfp_keys;
Expand Down
2 changes: 1 addition & 1 deletion net/sched/act_simple.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ static int tcf_simp(struct sk_buff *skb, const struct tc_action *a,
struct tcf_defact *d = a->priv;

spin_lock(&d->tcf_lock);
d->tcf_tm.lastuse = jiffies;
tcf_lastuse_update(&d->tcf_tm);
bstats_update(&d->tcf_bstats, skb);

/* print policy string followed by _ then packet count
Expand Down
2 changes: 1 addition & 1 deletion net/sched/act_skbedit.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static int tcf_skbedit(struct sk_buff *skb, const struct tc_action *a,
struct tcf_skbedit *d = a->priv;

spin_lock(&d->tcf_lock);
d->tcf_tm.lastuse = jiffies;
tcf_lastuse_update(&d->tcf_tm);
bstats_update(&d->tcf_bstats, skb);

if (d->flags & SKBEDIT_F_PRIORITY)
Expand Down
2 changes: 1 addition & 1 deletion net/sched/act_vlan.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static int tcf_vlan(struct sk_buff *skb, const struct tc_action *a,
int err;

spin_lock(&v->tcf_lock);
v->tcf_tm.lastuse = jiffies;
tcf_lastuse_update(&v->tcf_tm);
bstats_update(&v->tcf_bstats, skb);
action = v->tcf_action;

Expand Down

0 comments on commit 9c4a4e4

Please sign in to comment.