net: convert BUG_TRAP to generic WARN_ON

[linux-2.6-omap-h63xx.git] / net / ipv6 / inet6_connection_sock.c

diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
index 25b93170974928dc965cd15157f4110c3a7341db..16d43f20b32f83c5994cb4d1479c6393c5ae0961 100644 (file)
--- a/net/ipv6/inet6_connection_sock.c
+++ b/net/ipv6/inet6_connection_sock.c
@@ -33,6 +33,10 @@ int inet6_csk_bind_conflict(const struct sock *sk,
        const struct hlist_node *node;
 
        /* We must walk the whole port owner list in this case. -DaveM */
+       /*
+        * See comment in inet_csk_bind_conflict about sock lookup
+        * vs net namespaces issues.
+        */
        sk_for_each_bound(sk2, node, &tb->owners) {
                if (sk != sk2 &&
                    (!sk->sk_bound_dev_if ||
@@ -94,7 +98,7 @@ struct request_sock *inet6_csk_search_req(const struct sock *sk,
                    ipv6_addr_equal(&treq->rmt_addr, raddr) &&
                    ipv6_addr_equal(&treq->loc_addr, laddr) &&
                    (!treq->iif || treq->iif == iif)) {
-                       BUG_TRAP(req->sk == NULL);
+                       WARN_ON(req->sk != NULL);
                        *prevp = prev;
                        return req;
                }
@@ -146,7 +150,7 @@ void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst,
        __ip6_dst_store(sk, dst, daddr, saddr);
 
 #ifdef CONFIG_XFRM
-       if (dst) {
+       {
                struct rt6_info *rt = (struct rt6_info  *)dst;
                rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid);
        }