diff options
author | Johannes Berg <johannes.berg@intel.com> | 2017-12-02 08:41:55 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-12-05 11:29:48 -0500 |
commit | 029b6d1405504984b9d2661110ff1a17467d3426 (patch) | |
tree | fcb14271eeeb7bb11d58f0a5bcf2222227554b1b /net | |
parent | 42d779ffc186f6dd26271fc60a7417cb51aca93e (diff) | |
download | linux-029b6d1405504984b9d2661110ff1a17467d3426.tar.gz linux-029b6d1405504984b9d2661110ff1a17467d3426.tar.bz2 linux-029b6d1405504984b9d2661110ff1a17467d3426.zip |
Revert "net: core: maybe return -EEXIST in __dev_alloc_name"
This reverts commit d6f295e9def0; some userspace (in the case
we noticed it's wpa_supplicant), is relying on the current
error code to determine that a fixed name interface already
exists.
Reported-by: Jouni Malinen <j@w1.fi>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 07ed21d64f92..f47e96b62308 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1106,7 +1106,7 @@ static int __dev_alloc_name(struct net *net, const char *name, char *buf) * when the name is long and there isn't enough space left * for the digits, or if all bits are used. */ - return p ? -ENFILE : -EEXIST; + return -ENFILE; } static int dev_alloc_name_ns(struct net *net, |