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 /net/rose | |
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 'net/rose')
-rw-r--r-- | net/rose/af_rose.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 8451c8cdc9de..a85c1a086ae4 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c | |||
@@ -1538,7 +1538,7 @@ static int __init rose_proto_init(void) | |||
1538 | char name[IFNAMSIZ]; | 1538 | char name[IFNAMSIZ]; |
1539 | 1539 | ||
1540 | sprintf(name, "rose%d", i); | 1540 | sprintf(name, "rose%d", i); |
1541 | dev = alloc_netdev(0, name, rose_setup); | 1541 | dev = alloc_netdev(0, name, NET_NAME_UNKNOWN, rose_setup); |
1542 | if (!dev) { | 1542 | if (!dev) { |
1543 | printk(KERN_ERR "ROSE: rose_proto_init - unable to allocate memory\n"); | 1543 | printk(KERN_ERR "ROSE: rose_proto_init - unable to allocate memory\n"); |
1544 | rc = -ENOMEM; | 1544 | rc = -ENOMEM; |