net: nlmon: Remove init and uninit functions

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.

Remove the allocation in the nlmon driver and leverage the network
core allocation.

Signed-off-by: Breno Leitao <leitao@debian.org>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
index 5e19a6839dea8f5e624c6cd823e6bb17faf2f4cc..e026bfc83757de10b0954bfedfa570ae7d0a52ec 100644 (file)
--- a/drivers/net/nlmon.c
+++ b/drivers/net/nlmon.c
@@ -17,17 +17,6 @@ static netdev_tx_t nlmon_xmit(struct sk_buff *skb, struct net_device *dev)
        return NETDEV_TX_OK;
 }
 
-static int nlmon_dev_init(struct net_device *dev)
-{
-       dev->lstats = netdev_alloc_pcpu_stats(struct pcpu_lstats);
-       return dev->lstats == NULL ? -ENOMEM : 0;
-}
-
-static void nlmon_dev_uninit(struct net_device *dev)
-{
-       free_percpu(dev->lstats);
-}
-
 struct nlmon {
        struct netlink_tap nt;
 };
@@ -72,8 +61,6 @@ static const struct ethtool_ops nlmon_ethtool_ops = {
 };
 
 static const struct net_device_ops nlmon_ops = {
-       .ndo_init = nlmon_dev_init,
-       .ndo_uninit = nlmon_dev_uninit,
        .ndo_open = nlmon_open,
        .ndo_stop = nlmon_close,
        .ndo_start_xmit = nlmon_xmit,
@@ -92,6 +79,7 @@ static void nlmon_setup(struct net_device *dev)
        dev->features = NETIF_F_SG | NETIF_F_FRAGLIST |
                        NETIF_F_HIGHDMA | NETIF_F_LLTX;
        dev->flags = IFF_NOARP;
+       dev->pcpu_stat_type = NETDEV_PCPU_STAT_LSTATS;
 
        /* That's rather a softlimit here, which, of course,
         * can be altered. Not a real MTU, but what is to be