mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 00:40:03 +00:00
net: set name assign type for renamed devices
Based on a patch from David Herrmann. This is the only place devices can be renamed. v9: restore revers-christmas-tree order of local variables 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>
This commit is contained in:
parent
685343fc3b
commit
238fa3623a
1 changed files with 7 additions and 0 deletions
|
@ -1082,6 +1082,7 @@ static int dev_get_valid_name(struct net *net,
|
|||
*/
|
||||
int dev_change_name(struct net_device *dev, const char *newname)
|
||||
{
|
||||
unsigned char old_assign_type;
|
||||
char oldname[IFNAMSIZ];
|
||||
int err = 0;
|
||||
int ret;
|
||||
|
@ -1109,10 +1110,14 @@ int dev_change_name(struct net_device *dev, const char *newname)
|
|||
return err;
|
||||
}
|
||||
|
||||
old_assign_type = dev->name_assign_type;
|
||||
dev->name_assign_type = NET_NAME_RENAMED;
|
||||
|
||||
rollback:
|
||||
ret = device_rename(&dev->dev, dev->name);
|
||||
if (ret) {
|
||||
memcpy(dev->name, oldname, IFNAMSIZ);
|
||||
dev->name_assign_type = old_assign_type;
|
||||
write_seqcount_end(&devnet_rename_seq);
|
||||
return ret;
|
||||
}
|
||||
|
@ -1141,6 +1146,8 @@ int dev_change_name(struct net_device *dev, const char *newname)
|
|||
write_seqcount_begin(&devnet_rename_seq);
|
||||
memcpy(dev->name, oldname, IFNAMSIZ);
|
||||
memcpy(oldname, newname, IFNAMSIZ);
|
||||
dev->name_assign_type = old_assign_type;
|
||||
old_assign_type = NET_NAME_RENAMED;
|
||||
goto rollback;
|
||||
} else {
|
||||
pr_err("%s: name change rollback failed: %d\n",
|
||||
|
|
Loading…
Reference in a new issue