Commit 1d03d51e authored by Breno Leitao's avatar Breno Leitao Committed by Jakub Kicinski
Browse files

net: macsec: Leverage core stats allocator 



With commit 34d21de9 ("net: Move {l,t,d}stats allocation to core and
convert veth & vrf"), stats allocation could be done on net core
instead of in 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 macsec driver and leverage the network
core allocation instead.

Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Reviewed-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Link: https://lore.kernel.org/r/20240305113728.1974944-1-leitao@debian.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d6620629

drivers/net/macsec.c

+2 −8
Original line number Diff line number Diff line
@@ -3519,18 +3519,13 @@ static int macsec_dev_init(struct net_device *dev) 
	struct net_device *real_dev = macsec->real_dev;

	int err;



	dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);

	if (!dev->tstats)

		return -ENOMEM;



	err = gro_cells_init(&macsec->gro_cells, dev);

	if (err) {

		free_percpu(dev->tstats);

	if (err)

		return err;

	}



	dev->features = real_dev->features & MACSEC_FEATURES;

	dev->features |= NETIF_F_LLTX | NETIF_F_GSO_SOFTWARE;

	dev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;



	macsec_set_head_tail_room(dev);
@@ -3550,7 +3545,6 @@ static void macsec_dev_uninit(struct net_device *dev) 
	struct macsec_dev *macsec = macsec_priv(dev);



	gro_cells_destroy(&macsec->gro_cells);

	free_percpu(dev->tstats);

}



static netdev_features_t macsec_fix_features(struct net_device *dev,