net: unify the pcpu_tstats and br_cpu_netstats as one

They are same, so unify them as one, pcpu_sw_netstats.

Define pcpu_sw_netstat in netdevice.h, remove pcpu_tstats
from if_tunnel and remove br_cpu_netstats from br_private.h

Cc: Cong Wang <xiyou.wangcong@gmail.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 7 insertions, 15 deletions

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index f00cfd2a0143..e4401a531afb 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -32,7 +32,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
         const unsigned char *dest = skb->data;
         struct net_bridge_fdb_entry *dst;
         struct net_bridge_mdb_entry *mdst;
-        struct br_cpu_netstats *brstats = this_cpu_ptr(br->stats);
+        struct pcpu_sw_netstats *brstats = this_cpu_ptr(br->stats);
         u16 vid = 0;
 
         rcu_read_lock();
@@ -90,12 +90,12 @@ static int br_dev_init(struct net_device *dev)
         struct net_bridge *br = netdev_priv(dev);
         int i;
 
-        br->stats = alloc_percpu(struct br_cpu_netstats);
+        br->stats = alloc_percpu(struct pcpu_sw_netstats);
         if (!br->stats)
                 return -ENOMEM;
 
         for_each_possible_cpu(i) {
-                struct br_cpu_netstats *br_dev_stats;
+                struct pcpu_sw_netstats *br_dev_stats;
                 br_dev_stats = per_cpu_ptr(br->stats, i);
                 u64_stats_init(&br_dev_stats->syncp);
         }
@@ -135,12 +135,12 @@ static struct rtnl_link_stats64 *br_get_stats64(struct net_device *dev,
                                                 struct rtnl_link_stats64 *stats)
 {
         struct net_bridge *br = netdev_priv(dev);
-        struct br_cpu_netstats tmp, sum = { 0 };
+        struct pcpu_sw_netstats tmp, sum = { 0 };
         unsigned int cpu;
 
         for_each_possible_cpu(cpu) {
                 unsigned int start;
-                const struct br_cpu_netstats *bstats
+                const struct pcpu_sw_netstats *bstats
                         = per_cpu_ptr(br->stats, cpu);
                 do {
                         start = u64_stats_fetch_begin_bh(&bstats->syncp);
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 7e73c32e205d..bf8dc7d308d6 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -28,7 +28,7 @@ static int br_pass_frame_up(struct sk_buff *skb)
 {
         struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)->brdev;
         struct net_bridge *br = netdev_priv(brdev);
-        struct br_cpu_netstats *brstats = this_cpu_ptr(br->stats);
+        struct pcpu_sw_netstats *brstats = this_cpu_ptr(br->stats);
 
         u64_stats_update_begin(&brstats->syncp);
         brstats->rx_packets++;
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 2e77d923c8ee..3733f152351c 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -210,21 +210,13 @@ static inline struct net_bridge_port *br_port_get_rtnl(const struct net_device *
                 rtnl_dereference(dev->rx_handler_data) : NULL;
 }
 
-struct br_cpu_netstats {
-        u64                     rx_packets;
-        u64                     rx_bytes;
-        u64                     tx_packets;
-        u64                     tx_bytes;
-        struct u64_stats_sync   syncp;
-};
-
 struct net_bridge
 {
         spinlock_t                      lock;
         struct list_head                port_list;
         struct net_device               *dev;
 
-        struct br_cpu_netstats __percpu *stats;
+        struct pcpu_sw_netstats         __percpu *stats;
         spinlock_t                      hash_lock;
         struct hlist_head               hash[BR_HASH_SIZE];
 #ifdef CONFIG_BRIDGE_NETFILTER