summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLi RongQing <lirongqing@baidu.com>2018-06-19 17:23:17 +0800
committerDavid S. Miller <davem@davemloft.net>2018-06-20 08:12:57 +0900
commit7892bd081045222b9e4027fec279a28d6fe7aa66 (patch)
treeac435c2ffe7e6a17d7ff3133999c4dd30f21309e /net
parent56f772279a762984f6e9ebbf24a7c829faba5712 (diff)
downloadblackbird-op-linux-7892bd081045222b9e4027fec279a28d6fe7aa66.tar.gz
blackbird-op-linux-7892bd081045222b9e4027fec279a28d6fe7aa66.zip
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 <lirongqing@baidu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 57b7bab5f70b..a5aa1c7444e6 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();
OpenPOWER on IntegriCloud