diff options
| -rw-r--r-- | net/core/dev.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 0830f2967221..a37a932a3e14 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1131,14 +1131,13 @@ static int dev_prep_valid_name(struct net *net, struct net_device *dev, if (!dev_valid_name(want_name)) return -EINVAL; - if (strchr(want_name, '%')) { + if (strchr(want_name, '%')) return __dev_alloc_name(net, want_name, out_name); - } else if (netdev_name_in_use(net, want_name)) { + + if (netdev_name_in_use(net, want_name)) return -dup_errno; - } else if (out_name != want_name) { + if (out_name != want_name) strscpy(out_name, want_name, IFNAMSIZ); - } - return 0; } |