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/ipv6/ip6_gre.c | |
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/ipv6/ip6_gre.c')
-rw-r--r-- | net/ipv6/ip6_gre.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 365b2b6f3942..5f19dfbc4c6a 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c | |||
@@ -322,7 +322,8 @@ static struct ip6_tnl *ip6gre_tunnel_locate(struct net *net, | |||
322 | else | 322 | else |
323 | strcpy(name, "ip6gre%d"); | 323 | strcpy(name, "ip6gre%d"); |
324 | 324 | ||
325 | dev = alloc_netdev(sizeof(*t), name, ip6gre_tunnel_setup); | 325 | dev = alloc_netdev(sizeof(*t), name, NET_NAME_UNKNOWN, |
326 | ip6gre_tunnel_setup); | ||
326 | if (!dev) | 327 | if (!dev) |
327 | return NULL; | 328 | return NULL; |
328 | 329 | ||
@@ -1326,7 +1327,8 @@ static int __net_init ip6gre_init_net(struct net *net) | |||
1326 | int err; | 1327 | int err; |
1327 | 1328 | ||
1328 | ign->fb_tunnel_dev = alloc_netdev(sizeof(struct ip6_tnl), "ip6gre0", | 1329 | ign->fb_tunnel_dev = alloc_netdev(sizeof(struct ip6_tnl), "ip6gre0", |
1329 | ip6gre_tunnel_setup); | 1330 | NET_NAME_UNKNOWN, |
1331 | ip6gre_tunnel_setup); | ||
1330 | if (!ign->fb_tunnel_dev) { | 1332 | if (!ign->fb_tunnel_dev) { |
1331 | err = -ENOMEM; | 1333 | err = -ENOMEM; |
1332 | goto err_alloc_dev; | 1334 | goto err_alloc_dev; |