aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan/sbni.c
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-07-14 10:37:24 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-15 19:12:48 -0400
commitc835a677331495cf137a7f8a023463afd9f032f8 (patch)
treeca1b7c3aa3c2404f7912388e70f7e0cb9cf37043 /drivers/net/wan/sbni.c
parent238fa3623a5709d29673ed78ff8e714d040fbb89 (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 'drivers/net/wan/sbni.c')
-rw-r--r--drivers/net/wan/sbni.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 1b89ecf0959e..758c4ba1e97c 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -227,7 +227,8 @@ int __init sbni_probe(int unit)
227 struct net_device *dev; 227 struct net_device *dev;
228 int err; 228 int err;
229 229
230 dev = alloc_netdev(sizeof(struct net_local), "sbni", sbni_devsetup); 230 dev = alloc_netdev(sizeof(struct net_local), "sbni",
231 NET_NAME_UNKNOWN, sbni_devsetup);
231 if (!dev) 232 if (!dev)
232 return -ENOMEM; 233 return -ENOMEM;
233 234
@@ -1477,8 +1478,8 @@ int __init init_module( void )
1477 int err; 1478 int err;
1478 1479
1479 while( num < SBNI_MAX_NUM_CARDS ) { 1480 while( num < SBNI_MAX_NUM_CARDS ) {
1480 dev = alloc_netdev(sizeof(struct net_local), 1481 dev = alloc_netdev(sizeof(struct net_local), "sbni%d",
1481 "sbni%d", sbni_devsetup); 1482 NET_NAME_UNKNOWN, sbni_devsetup);
1482 if( !dev) 1483 if( !dev)
1483 break; 1484 break;
1484 1485