net: rtnetlink - make create_link take name_assign_type

This passes down NET_NAME_USER (or NET_NAME_ENUM) to alloc_netdev(),
for any device created over rtnetlink.

v9: restore reverse-christmas-tree order of local variables

Signed-off-by: Tom Gundersen <teg@jklm.no>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 9b945e60530e..8ad596573d17 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -335,6 +335,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
         struct veth_priv *priv;
         char ifname[IFNAMSIZ];
         struct nlattr *peer_tb[IFLA_MAX + 1], **tbp;
+        unsigned char name_assign_type;
         struct ifinfomsg *ifmp;
         struct net *net;
 
@@ -362,16 +363,20 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
                 tbp = tb;
         }
 
-        if (tbp[IFLA_IFNAME])
+        if (tbp[IFLA_IFNAME]) {
                 nla_strlcpy(ifname, tbp[IFLA_IFNAME], IFNAMSIZ);
-        else
+                name_assign_type = NET_NAME_USER;
+        } else {
                 snprintf(ifname, IFNAMSIZ, DRV_NAME "%%d");
+                name_assign_type = NET_NAME_ENUM;
+        }
 
         net = rtnl_link_get_net(src_net, tbp);
         if (IS_ERR(net))
                 return PTR_ERR(net);
 
-        peer = rtnl_create_link(net, ifname, &veth_link_ops, tbp);
+        peer = rtnl_create_link(net, ifname, name_assign_type,
+                                &veth_link_ops, tbp);
         if (IS_ERR(peer)) {
                 put_net(net);
                 return PTR_ERR(peer);