1 files changed, 3 insertions, 9 deletions

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index c8624a8235ab..2b1a1d61072c 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1540,16 +1540,10 @@ static int team_init(struct net_device *dev)
         mutex_init(&team->lock);
         team_set_no_mode(team);
 
-        team->pcpu_stats = alloc_percpu(struct team_pcpu_stats);
+        team->pcpu_stats = netdev_alloc_pcpu_stats(struct team_pcpu_stats);
         if (!team->pcpu_stats)
                 return -ENOMEM;
 
-        for_each_possible_cpu(i) {
-                struct team_pcpu_stats *team_stats;
-                team_stats = per_cpu_ptr(team->pcpu_stats, i);
-                u64_stats_init(&team_stats->syncp);
-        }
-
         for (i = 0; i < TEAM_PORT_HASHENTRIES; i++)
                 INIT_HLIST_HEAD(&team->en_port_hlist[i]);
         INIT_LIST_HEAD(&team->port_list);
@@ -1767,13 +1761,13 @@ team_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
         for_each_possible_cpu(i) {
                 p = per_cpu_ptr(team->pcpu_stats, i);
                 do {
-                        start = u64_stats_fetch_begin_bh(&p->syncp);
+                        start = u64_stats_fetch_begin_irq(&p->syncp);
                         rx_packets      = p->rx_packets;
                         rx_bytes        = p->rx_bytes;
                         rx_multicast    = p->rx_multicast;
                         tx_packets      = p->tx_packets;
                         tx_bytes        = p->tx_bytes;
-                } while (u64_stats_fetch_retry_bh(&p->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&p->syncp, start));
 
                 stats->rx_packets       += rx_packets;
                 stats->rx_bytes         += rx_bytes;