|
@@ -954,18 +954,22 @@ int dev_alloc_name(struct net_device *dev, const char *name)
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(dev_alloc_name);
|
|
EXPORT_SYMBOL(dev_alloc_name);
|
|
|
|
|
|
-static int dev_get_valid_name(struct net *net, const char *name, char *buf,
|
|
|
|
- bool fmt)
|
|
|
|
|
|
+static int dev_get_valid_name(struct net_device *dev, const char *name, bool fmt)
|
|
{
|
|
{
|
|
|
|
+ struct net *net;
|
|
|
|
+
|
|
|
|
+ BUG_ON(!dev_net(dev));
|
|
|
|
+ net = dev_net(dev);
|
|
|
|
+
|
|
if (!dev_valid_name(name))
|
|
if (!dev_valid_name(name))
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
if (fmt && strchr(name, '%'))
|
|
if (fmt && strchr(name, '%'))
|
|
- return __dev_alloc_name(net, name, buf);
|
|
|
|
|
|
+ return dev_alloc_name(dev, name);
|
|
else if (__dev_get_by_name(net, name))
|
|
else if (__dev_get_by_name(net, name))
|
|
return -EEXIST;
|
|
return -EEXIST;
|
|
- else if (buf != name)
|
|
|
|
- strlcpy(buf, name, IFNAMSIZ);
|
|
|
|
|
|
+ else if (dev->name != name)
|
|
|
|
+ strlcpy(dev->name, name, IFNAMSIZ);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
@@ -997,7 +1001,7 @@ int dev_change_name(struct net_device *dev, const char *newname)
|
|
|
|
|
|
memcpy(oldname, dev->name, IFNAMSIZ);
|
|
memcpy(oldname, dev->name, IFNAMSIZ);
|
|
|
|
|
|
- err = dev_get_valid_name(net, newname, dev->name, 1);
|
|
|
|
|
|
+ err = dev_get_valid_name(dev, newname, 1);
|
|
if (err < 0)
|
|
if (err < 0)
|
|
return err;
|
|
return err;
|
|
|
|
|
|
@@ -4965,7 +4969,7 @@ int register_netdevice(struct net_device *dev)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- ret = dev_get_valid_name(net, dev->name, dev->name, 0);
|
|
|
|
|
|
+ ret = dev_get_valid_name(dev, dev->name, 0);
|
|
if (ret)
|
|
if (ret)
|
|
goto err_uninit;
|
|
goto err_uninit;
|
|
|
|
|
|
@@ -5574,7 +5578,7 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
|
|
/* We get here if we can't use the current device name */
|
|
/* We get here if we can't use the current device name */
|
|
if (!pat)
|
|
if (!pat)
|
|
goto out;
|
|
goto out;
|
|
- if (dev_get_valid_name(net, pat, dev->name, 1))
|
|
|
|
|
|
+ if (dev_get_valid_name(dev, pat, 1))
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|