summaryrefslogtreecommitdiff
path: root/net/ipv6
diff options
context:
space:
mode:
authorEnrico Weigelt <info@metux.net>2019-06-06 00:11:34 +0300
committerDavid S. Miller <davem@davemloft.net>2019-06-06 02:57:23 +0300
commit26f8113cc720b6362432cb8b9ed61dc913418b0c (patch)
tree05673170ad8de38fc6ae5d8767ca438f0a546de8 /net/ipv6
parent88e235b80c2ad9117e153f2651857142d2d65db9 (diff)
downloadlinux-26f8113cc720b6362432cb8b9ed61dc913418b0c.tar.xz
net: ipv6: drop unneeded likely() call around IS_ERR()
IS_ERR() already calls unlikely(), so this extra unlikely() call around IS_ERR() is not needed. Signed-off-by: Enrico Weigelt <info@metux.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/inet6_hashtables.c2
-rw-r--r--net/ipv6/udp.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
index f3515ebe9b3a..c42252eae873 100644
--- a/net/ipv6/inet6_hashtables.c
+++ b/net/ipv6/inet6_hashtables.c
@@ -178,7 +178,7 @@ struct sock *inet6_lookup_listener(struct net *net,
saddr, sport, &in6addr_any, hnum,
dif, sdif);
done:
- if (unlikely(IS_ERR(result)))
+ if (IS_ERR(result))
return NULL;
return result;
}
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 07fa579dfb96..4a7869db5b6a 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -219,7 +219,7 @@ struct sock *__udp6_lib_lookup(struct net *net,
exact_dif, hslot2,
skb);
}
- if (unlikely(IS_ERR(result)))
+ if (IS_ERR(result))
return NULL;
return result;
}