Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 238fa362 authored by Tom Gundersen's avatar Tom Gundersen Committed by David S. Miller
Browse files

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: default avatarTom Gundersen <teg@jklm.no>
Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 685343fc

net/core/dev.c

+7 −0
Original line number Diff line number Diff line
@@ -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 @@ rollback: 
			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",