wifi: mac80211: Move stats allocation to core

With commit 34d21de99cea9 ("net: Move {l,t,d}stats allocation to core and
convert veth & vrf"), stats allocation could be done on net core instead
of this driver.

With this new approach, the driver doesn't have to bother with error
handling (allocation failure checking, making sure free happens in the
right spot, etc). This is core responsibility now.

Move mac80211 driver to leverage the core allocation.

Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://msgid.link/20240607102045.235071-1-leitao@debian.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index d1a49ee4a194f760b0d5c5562302b4b4c8f6e1f2..ac4d4df652980a43153f0ec3a6670e9bb62fc073 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1458,11 +1458,6 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
        return res;
 }
 
-static void ieee80211_if_free(struct net_device *dev)
-{
-       free_percpu(dev->tstats);
-}
-
 static void ieee80211_if_setup(struct net_device *dev)
 {
        ether_setup(dev);
@@ -1470,7 +1465,6 @@ static void ieee80211_if_setup(struct net_device *dev)
        dev->priv_flags |= IFF_NO_QUEUE;
        dev->netdev_ops = &ieee80211_dataif_ops;
        dev->needs_free_netdev = true;
-       dev->priv_destructor = ieee80211_if_free;
 }
 
 static void ieee80211_iface_process_skb(struct ieee80211_local *local,
@@ -2103,11 +2097,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
 
                dev_net_set(ndev, wiphy_net(local->hw.wiphy));
 
-               ndev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
-               if (!ndev->tstats) {
-                       free_netdev(ndev);
-                       return -ENOMEM;
-               }
+               ndev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;
 
                ndev->needed_headroom = local->tx_headroom +
                                        4*6 /* four MAC addresses */
@@ -2120,7 +2110,6 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
 
                ret = dev_alloc_name(ndev, ndev->name);
                if (ret < 0) {
-                       ieee80211_if_free(ndev);
                        free_netdev(ndev);
                        return ret;
                }