1 files changed, 7 insertions, 6 deletions

diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h
index 00cbb4384c79..9e34c877a770 100644
--- a/include/net/inet6_hashtables.h
+++ b/include/net/inet6_hashtables.h
@@ -96,14 +96,15 @@ static inline struct sock *__inet6_lookup_skb(struct inet_hashinfo *hashinfo,
                                               const __be16 sport,
                                               const __be16 dport)
 {
-        struct sock *sk;
+        struct sock *sk = skb_steal_sock(skb);
 
-        if (unlikely(sk = skb_steal_sock(skb)))
+        if (sk)
                 return sk;
-        else return __inet6_lookup(dev_net(skb_dst(skb)->dev), hashinfo,
-                                   &ipv6_hdr(skb)->saddr, sport,
-                                   &ipv6_hdr(skb)->daddr, ntohs(dport),
-                                   inet6_iif(skb));
+
+        return __inet6_lookup(dev_net(skb_dst(skb)->dev), hashinfo,
+                              &ipv6_hdr(skb)->saddr, sport,
+                              &ipv6_hdr(skb)->daddr, ntohs(dport),
+                              inet6_iif(skb));
 }
 
 extern struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo,