Bluetooth: A2MP: Create amp_mgr global list

[deliverable/linux.git] / include / net / inet6_hashtables.h

diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h
index 00cbb4384c795b470777bd501cb65c914df50f82..9e34c877a77093ff1257e18941949a12391363d6 100644 (file)
--- 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,