diff options
| author |   Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2017-11-13 00:15:07 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-11-14 16:38:46 +0900 |
| commit | 6224abda0db8845756571833744d4414f144ecb5 (patch) | |
| tree | aa6b654bc0e22efdf73a65db0d90b411d45a87e5 /net/core/dev.c | |
| parent | net: core: eliminate dev_alloc_name{,_ns} code duplication (diff) | |
| download | linux-dev-6224abda0db8845756571833744d4414f144ecb5.tar.xz linux-dev-6224abda0db8845756571833744d4414f144ecb5.zip | |
net: core: drop pointless check in __dev_alloc_name
The only caller passes a stack buffer as buf, so it won't equal the
passed-in name. Moreover, we're already using buf as a scratch buffer
inside the if (p) {} block, so if buf and name were the same, that
snprintf() call would be overwriting its own format string.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 7580c2046c95..4cedc7595f1f 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1095,8 +1095,7 @@ static int __dev_alloc_name(struct net *net, const char *name, char *buf) free_page((unsigned long) inuse); } - if (buf != name) - snprintf(buf, IFNAMSIZ, name, i); + snprintf(buf, IFNAMSIZ, name, i); if (!__dev_get_by_name(net, buf)) return i; |