net/sched: pass flow_stats instead of multiple stats args
Instead of passing 6 stats related args, pass the flow_stats. Signed-off-by: Oz Shlomo <ozsh@nvidia.com> Reviewed-by: Simon Horman <simon.horman@corigine.com> Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
parent
3320f36fd8
commit
ac7d27907d
|
@ -294,8 +294,7 @@ static inline void tcf_exts_put_net(struct tcf_exts *exts)
|
|||
|
||||
static inline void
|
||||
tcf_exts_hw_stats_update(const struct tcf_exts *exts,
|
||||
u64 bytes, u64 packets, u64 drops, u64 lastuse,
|
||||
u8 used_hw_stats, bool used_hw_stats_valid)
|
||||
struct flow_stats *stats)
|
||||
{
|
||||
#ifdef CONFIG_NET_CLS_ACT
|
||||
int i;
|
||||
|
@ -306,12 +305,12 @@ tcf_exts_hw_stats_update(const struct tcf_exts *exts,
|
|||
/* if stats from hw, just skip */
|
||||
if (tcf_action_update_hw_stats(a)) {
|
||||
preempt_disable();
|
||||
tcf_action_stats_update(a, bytes, packets, drops,
|
||||
lastuse, true);
|
||||
tcf_action_stats_update(a, stats->bytes, stats->pkts, stats->drops,
|
||||
stats->lastused, true);
|
||||
preempt_enable();
|
||||
|
||||
a->used_hw_stats = used_hw_stats;
|
||||
a->used_hw_stats_valid = used_hw_stats_valid;
|
||||
a->used_hw_stats = stats->used_hw_stats;
|
||||
a->used_hw_stats_valid = stats->used_hw_stats_valid;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -502,12 +502,7 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f,
|
|||
tc_setup_cb_call(block, TC_SETUP_CLSFLOWER, &cls_flower, false,
|
||||
rtnl_held);
|
||||
|
||||
tcf_exts_hw_stats_update(&f->exts, cls_flower.stats.bytes,
|
||||
cls_flower.stats.pkts,
|
||||
cls_flower.stats.drops,
|
||||
cls_flower.stats.lastused,
|
||||
cls_flower.stats.used_hw_stats,
|
||||
cls_flower.stats.used_hw_stats_valid);
|
||||
tcf_exts_hw_stats_update(&f->exts, &cls_flower.stats);
|
||||
}
|
||||
|
||||
static void __fl_put(struct cls_fl_filter *f)
|
||||
|
|
|
@ -331,11 +331,7 @@ static void mall_stats_hw_filter(struct tcf_proto *tp,
|
|||
|
||||
tc_setup_cb_call(block, TC_SETUP_CLSMATCHALL, &cls_mall, false, true);
|
||||
|
||||
tcf_exts_hw_stats_update(&head->exts, cls_mall.stats.bytes,
|
||||
cls_mall.stats.pkts, cls_mall.stats.drops,
|
||||
cls_mall.stats.lastused,
|
||||
cls_mall.stats.used_hw_stats,
|
||||
cls_mall.stats.used_hw_stats_valid);
|
||||
tcf_exts_hw_stats_update(&head->exts, &cls_mall.stats);
|
||||
}
|
||||
|
||||
static int mall_dump(struct net *net, struct tcf_proto *tp, void *fh,
|
||||
|
|
Loading…
Reference in New Issue