summaryrefslogtreecommitdiff
path: root/net/ipv6
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2017-09-26 11:22:31 +0200
committerDavid S. Miller <davem@davemloft.net>2017-09-26 09:54:06 -0700
commit63a4e80be4f523dbde6412decfa8244ff73cc4b9 (patch)
tree32bcaf3326f2dfee6aea28a8ecb365ac5a39fb06 /net/ipv6
parent98e4fcff3e755c6c3de2d4f63c080b4009a599bd (diff)
ipv6: Remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/addrconf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 96861c702c06..13c3b697f8c0 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -3297,7 +3297,7 @@ static int fixup_permanent_addr(struct inet6_dev *idev,
struct rt6_info *rt, *prev;
rt = addrconf_dst_alloc(idev, &ifp->addr, false);
- if (unlikely(IS_ERR(rt)))
+ if (IS_ERR(rt))
return PTR_ERR(rt);
/* ifp->rt can be accessed outside of rtnl */