iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: add devm version of alloc_etherdev_mqs function

Browse Source 
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: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Rafał Miłecki
2017-01-28 15:15:42 +01:00
committed by David S. Miller
parent 936f459bea
commit 40be0dda07
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/etherdevice.h
View File

@@ -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(sizeof_priv) alloc_etherdev_mq(sizeof_priv, 1)
#define alloc_etherdev_mq(sizeof_priv, count) alloc_etherdev_mqs(sizeof_priv, count, count) #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 **eth_gro_receive(struct sk_buff **head,
struct sk_buff *skb); struct sk_buff *skb);
int eth_gro_complete(struct sk_buff *skb, int nhoff); int eth_gro_complete(struct sk_buff *skb, int nhoff);

28
net/ethernet/eth.c
View File

@@ -392,6 +392,34 @@ struct net_device *alloc_etherdev_mqs(int sizeof_priv, unsigned int txqs,
} }
EXPORT_SYMBOL(alloc_etherdev_mqs); 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) ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len)
{ {
return scnprintf(buf, PAGE_SIZE, "%*phC\n", len, addr); return scnprintf(buf, PAGE_SIZE, "%*phC\n", len, addr);