ipv6: Remove redundant unlikely()
authorTobias Klauser <tklauser@distanz.ch>
Tue, 26 Sep 2017 09:22:31 +0000 (11:22 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 Sep 2017 16:54:06 +0000 (09:54 -0700)
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>
net/ipv6/addrconf.c

index 96861c7..13c3b69 100644 (file)
@@ -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 */