netns xfrm: ipcomp support

[safe/jmp/linux-2.6] / net / ipv4 / inet_connection_sock.c

diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 26fb50e..8da6429 100644 (file)
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -112,7 +112,7 @@ again:
                                        hashinfo->bhash_size)];
                        spin_lock(&head->lock);
                        inet_bind_bucket_for_each(tb, node, &head->chain)
-                               if (ib_net(tb) == net && tb->port == rover) {
+                               if (net_eq(ib_net(tb), net) && tb->port == rover) {
                                        if (tb->fastreuse > 0 &&
                                            sk->sk_reuse &&
                                            sk->sk_state != TCP_LISTEN &&
@@ -158,7 +158,7 @@ have_snum:
                                hashinfo->bhash_size)];
                spin_lock(&head->lock);
                inet_bind_bucket_for_each(tb, node, &head->chain)
-                       if (ib_net(tb) == net && tb->port == snum)
+                       if (net_eq(ib_net(tb), net) && tb->port == snum)
                                goto tb_found;
        }
        tb = NULL;
@@ -529,9 +529,11 @@ void inet_csk_reqsk_queue_prune(struct sock *parent,
                                syn_ack_recalc(req, thresh, max_retries,
                                               queue->rskq_defer_accept,
                                               &expire, &resend);
+                               if (req->rsk_ops->syn_ack_timeout)
+                                       req->rsk_ops->syn_ack_timeout(parent, req);
                                if (!expire &&
                                    (!resend ||
-                                    !req->rsk_ops->rtx_syn_ack(parent, req) ||
+                                    !req->rsk_ops->rtx_syn_ack(parent, req, NULL) ||
                                     inet_rsk(req)->acked)) {
                                        unsigned long timeo;