aboutsummaryrefslogtreecommitdiffstats
path: root/net/atm
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 /net/atm
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 'net/atm')
-rw-r--r--net/atm/br2684.c4
-rw-r--r--net/atm/clip.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 403e71fa88fe..cc78538d163b 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -682,8 +682,8 @@ static int br2684_create(void __user *arg)
682 682
683 netdev = alloc_netdev(sizeof(struct br2684_dev), 683 netdev = alloc_netdev(sizeof(struct br2684_dev),
684 ni.ifname[0] ? ni.ifname : "nas%d", 684 ni.ifname[0] ? ni.ifname : "nas%d",
685 (payload == p_routed) ? 685 NET_NAME_UNKNOWN,
686 br2684_setup_routed : br2684_setup); 686 (payload == p_routed) ? br2684_setup_routed : br2684_setup);
687 if (!netdev) 687 if (!netdev)
688 return -ENOMEM; 688 return -ENOMEM;
689 689
diff --git a/net/atm/clip.c b/net/atm/clip.c
index ba291ce4bdff..46339040fef0 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -520,7 +520,8 @@ static int clip_create(int number)
520 if (PRIV(dev)->number >= number) 520 if (PRIV(dev)->number >= number)
521 number = PRIV(dev)->number + 1; 521 number = PRIV(dev)->number + 1;
522 } 522 }
523 dev = alloc_netdev(sizeof(struct clip_priv), "", clip_setup); 523 dev = alloc_netdev(sizeof(struct clip_priv), "", NET_NAME_UNKNOWN,
524 clip_setup);
524 if (!dev) 525 if (!dev)
525 return -ENOMEM; 526 return -ENOMEM;
526 clip_priv = PRIV(dev); 527 clip_priv = PRIV(dev);