Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[linux.git] / net / sched / act_vlan.c

diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c
index 287a30bf8930e130745c2ccca42f2949975f225d..08aaf719a70fbbc1577705712f2cf6d3d5b0202e 100644 (file)
--- a/net/sched/act_vlan.c
+++ b/net/sched/act_vlan.c
@@ -301,6 +301,19 @@ static int tcf_vlan_walker(struct net *net, struct sk_buff *skb,
        return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
+static void tcf_vlan_stats_update(struct tc_action *a, u64 bytes, u32 packets,
+                                 u64 lastuse, bool hw)
+{
+       struct tcf_vlan *v = to_vlan(a);
+       struct tcf_t *tm = &v->tcf_tm;
+
+       _bstats_cpu_update(this_cpu_ptr(a->cpu_bstats), bytes, packets);
+       if (hw)
+               _bstats_cpu_update(this_cpu_ptr(a->cpu_bstats_hw),
+                                  bytes, packets);
+       tm->lastuse = max_t(u64, tm->lastuse, lastuse);
+}
+
 static int tcf_vlan_search(struct net *net, struct tc_action **a, u32 index)
 {
        struct tc_action_net *tn = net_generic(net, vlan_net_id);
@@ -325,6 +338,7 @@ static struct tc_action_ops act_vlan_ops = {
        .init           =       tcf_vlan_init,
        .cleanup        =       tcf_vlan_cleanup,
        .walk           =       tcf_vlan_walker,
+       .stats_update   =       tcf_vlan_stats_update,
        .get_fill_size  =       tcf_vlan_get_fill_size,
        .lookup         =       tcf_vlan_search,
        .size           =       sizeof(struct tcf_vlan),