diff options
author | Tom Gundersen <teg@jklm.no> | 2014-07-14 10:37:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-15 19:12:48 -0400 |
commit | c835a677331495cf137a7f8a023463afd9f032f8 (patch) | |
tree | ca1b7c3aa3c2404f7912388e70f7e0cb9cf37043 /include/linux/netdevice.h | |
parent | 238fa3623a5709d29673ed78ff8e714d040fbb89 (diff) |
net: set name_assign_type in alloc_netdev()
Extend alloc_netdev{,_mq{,s}}() to take name_assign_type as argument, and convert
all users to pass NET_NAME_UNKNOWN.
Coccinelle patch:
@@
expression sizeof_priv, name, setup, txqs, rxqs, count;
@@
(
-alloc_netdev_mqs(sizeof_priv, name, setup, txqs, rxqs)
+alloc_netdev_mqs(sizeof_priv, name, NET_NAME_UNKNOWN, setup, txqs, rxqs)
|
-alloc_netdev_mq(sizeof_priv, name, setup, count)
+alloc_netdev_mq(sizeof_priv, name, NET_NAME_UNKNOWN, setup, count)
|
-alloc_netdev(sizeof_priv, name, setup)
+alloc_netdev(sizeof_priv, name, NET_NAME_UNKNOWN, setup)
)
v9: move comments here from the wrong commit
Signed-off-by: Tom Gundersen <teg@jklm.no>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 9be34732142f..15ed750458ad 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -2991,13 +2991,15 @@ void ether_setup(struct net_device *dev); | |||
2991 | 2991 | ||
2992 | /* Support for loadable net-drivers */ | 2992 | /* Support for loadable net-drivers */ |
2993 | struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name, | 2993 | struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name, |
2994 | unsigned char name_assign_type, | ||
2994 | void (*setup)(struct net_device *), | 2995 | void (*setup)(struct net_device *), |
2995 | unsigned int txqs, unsigned int rxqs); | 2996 | unsigned int txqs, unsigned int rxqs); |
2996 | #define alloc_netdev(sizeof_priv, name, setup) \ | 2997 | #define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \ |
2997 | alloc_netdev_mqs(sizeof_priv, name, setup, 1, 1) | 2998 | alloc_netdev_mqs(sizeof_priv, name, name_assign_type, setup, 1, 1) |
2998 | 2999 | ||
2999 | #define alloc_netdev_mq(sizeof_priv, name, setup, count) \ | 3000 | #define alloc_netdev_mq(sizeof_priv, name, name_assign_type, setup, count) \ |
3000 | alloc_netdev_mqs(sizeof_priv, name, setup, count, count) | 3001 | alloc_netdev_mqs(sizeof_priv, name, name_assign_type, setup, count, \ |
3002 | count) | ||
3001 | 3003 | ||
3002 | int register_netdev(struct net_device *dev); | 3004 | int register_netdev(struct net_device *dev); |
3003 | void unregister_netdev(struct net_device *dev); | 3005 | void unregister_netdev(struct net_device *dev); |