1 From 40be0dda0725886b623d67868db3219a2e74683b Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
3 Date: Sat, 28 Jan 2017 15:15:42 +0100
4 Subject: [PATCH] net: add devm version of alloc_etherdev_mqs function
6 This patch adds devm_alloc_etherdev_mqs function and devm_alloc_etherdev
7 macro. These can be used for simpler netdev allocation without having to
8 care about calling free_netdev.
10 Thanks to this change drivers, their error paths and removal paths may
13 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
14 Signed-off-by: David S. Miller <davem@davemloft.net>
16 include/linux/etherdevice.h | 5 +++++
17 net/ethernet/eth.c | 28 ++++++++++++++++++++++++++++
18 2 files changed, 33 insertions(+)
20 --- a/include/linux/etherdevice.h
21 +++ b/include/linux/etherdevice.h
22 @@ -51,6 +51,11 @@ struct net_device *alloc_etherdev_mqs(in
23 #define alloc_etherdev(sizeof_priv) alloc_etherdev_mq(sizeof_priv, 1)
24 #define alloc_etherdev_mq(sizeof_priv, count) alloc_etherdev_mqs(sizeof_priv, count, count)
26 +struct net_device *devm_alloc_etherdev_mqs(struct device *dev, int sizeof_priv,
29 +#define devm_alloc_etherdev(dev, sizeof_priv) devm_alloc_etherdev_mqs(dev, sizeof_priv, 1, 1)
31 struct sk_buff **eth_gro_receive(struct sk_buff **head,
33 int eth_gro_complete(struct sk_buff *skb, int nhoff);
34 --- a/net/ethernet/eth.c
35 +++ b/net/ethernet/eth.c
36 @@ -387,6 +387,34 @@ struct net_device *alloc_etherdev_mqs(in
38 EXPORT_SYMBOL(alloc_etherdev_mqs);
40 +static void devm_free_netdev(struct device *dev, void *res)
42 + free_netdev(*(struct net_device **)res);
45 +struct net_device *devm_alloc_etherdev_mqs(struct device *dev, int sizeof_priv,
46 + unsigned int txqs, unsigned int rxqs)
48 + struct net_device **dr;
49 + struct net_device *netdev;
51 + dr = devres_alloc(devm_free_netdev, sizeof(*dr), GFP_KERNEL);
55 + netdev = alloc_etherdev_mqs(sizeof_priv, txqs, rxqs);
62 + devres_add(dev, dr);
66 +EXPORT_SYMBOL(devm_alloc_etherdev_mqs);
68 ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len)
70 return scnprintf(buf, PAGE_SIZE, "%*phC\n", len, addr);