From: Tobias Klauser <tklauser@distanz.ch>
Date: Tue, 26 Sep 2017 09:22:31 +0000 (+0200)
Subject: ipv6: Remove redundant unlikely()
X-Git-Tag: v4.15-rc1~84^2~632
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63a4e80be4f523dbde6412decfa8244ff73cc4b9;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 96861c702c069..13c3b697f8c04 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 */