From: Li RongQing Date: Tue, 19 Jun 2018 09:23:17 +0000 (+0800) Subject: net: propagate dev_get_valid_name return code X-Git-Tag: v4.19~747^2~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7892bd081045222b9e4027fec279a28d6fe7aa66;p=platform%2Fkernel%2Flinux-rpi.git net: propagate dev_get_valid_name return code if dev_get_valid_name failed, propagate its return code and remove the setting err to ENODEV, it will be set to 0 again before dev_change_net_namespace exits. Signed-off-by: Li RongQing Signed-off-by: David S. Miller --- diff --git a/net/core/dev.c b/net/core/dev.c index 57b7bab..a5aa1c7 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -8643,7 +8643,8 @@ 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 */ if (!pat) goto out; - if (dev_get_valid_name(net, dev, pat) < 0) + err = dev_get_valid_name(net, dev, pat); + if (err < 0) goto out; } @@ -8655,7 +8656,6 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char dev_close(dev); /* And unlink it from device chain */ - err = -ENODEV; unlist_netdevice(dev); synchronize_net();