diff options
author | David S. Miller <davem@davemloft.net> | 2017-12-09 22:09:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-12-09 22:09:55 -0500 |
commit | 51e18a453f5f59a40c721d4aeab082b4e2e9fac6 (patch) | |
tree | 540d37e6f7a83466677ab6095fcdd2d6f72583c4 /net/core | |
parent | 5e54b3c1202765ae62de24a160f1eaf6b0ebf9d4 (diff) | |
parent | f335195adf043168ee69d78ea72ac3e30f0c57ce (diff) | |
download | linux-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.tar.gz linux-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.tar.bz2 linux-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflict was two parallel additions of include files to sch_generic.c,
no biggie.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-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 e32cf5c7f200..8aa2f70995e8 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, |