Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40be0dda authored by Rafał Miłecki's avatar Rafał Miłecki Committed by David S. Miller
Browse files

net: add devm version of alloc_etherdev_mqs function 



This patch adds devm_alloc_etherdev_mqs function and devm_alloc_etherdev
macro. These can be used for simpler netdev allocation without having to
care about calling free_netdev.

Thanks to this change drivers, their error paths and removal paths may
get simpler by a bit.

Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 936f459b

include/linux/etherdevice.h

+5 −0
Original line number Diff line number Diff line
@@ -54,6 +54,11 @@ struct net_device *alloc_etherdev_mqs(int sizeof_priv, unsigned int txqs, 
#define alloc_etherdev(sizeof_priv) alloc_etherdev_mq(sizeof_priv, 1)

#define alloc_etherdev_mq(sizeof_priv, count) alloc_etherdev_mqs(sizeof_priv, count, count)



struct net_device *devm_alloc_etherdev_mqs(struct device *dev, int sizeof_priv,

					   unsigned int txqs,

					   unsigned int rxqs);

#define devm_alloc_etherdev(dev, sizeof_priv) devm_alloc_etherdev_mqs(dev, sizeof_priv, 1, 1)



struct sk_buff **eth_gro_receive(struct sk_buff **head,

				 struct sk_buff *skb);

int eth_gro_complete(struct sk_buff *skb, int nhoff);

net/ethernet/eth.c

+28 −0
Original line number Diff line number Diff line
@@ -392,6 +392,34 @@ struct net_device *alloc_etherdev_mqs(int sizeof_priv, unsigned int txqs, 
}

EXPORT_SYMBOL(alloc_etherdev_mqs);



static void devm_free_netdev(struct device *dev, void *res)

{

	free_netdev(*(struct net_device **)res);

}



struct net_device *devm_alloc_etherdev_mqs(struct device *dev, int sizeof_priv,

					   unsigned int txqs, unsigned int rxqs)

{

	struct net_device **dr;

	struct net_device *netdev;



	dr = devres_alloc(devm_free_netdev, sizeof(*dr), GFP_KERNEL);

	if (!dr)

		return NULL;



	netdev = alloc_etherdev_mqs(sizeof_priv, txqs, rxqs);

	if (!netdev) {

		devres_free(dr);

		return NULL;

	}



	*dr = netdev;

	devres_add(dev, dr);



	return netdev;

}

EXPORT_SYMBOL(devm_alloc_etherdev_mqs);



ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len)

{

	return scnprintf(buf, PAGE_SIZE, "%*phC\n", len, addr);