Merge branch 'net-2.6-misc-20080611a' of git://git.linux-ipv6.org/gitroot/yoshfuji...

[linux-2.6] / net / dccp / minisocks.c

diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index 027d1814e1ab39da6efdc7cceead60ac38c01fe8..66dca5bba858612e747a399d9bcea41bb03dc0f6 100644 (file)
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -165,12 +165,12 @@ out_free:
                /* See dccp_v4_conn_request */
                newdmsk->dccpms_sequence_window = req->rcv_wnd;
 
-               newdp->dccps_gar = newdp->dccps_isr = dreq->dreq_isr;
-               dccp_update_gsr(newsk, dreq->dreq_isr);
-
-               newdp->dccps_iss = dreq->dreq_iss;
+               newdp->dccps_gar = newdp->dccps_iss = dreq->dreq_iss;
                dccp_update_gss(newsk, dreq->dreq_iss);
 
+               newdp->dccps_isr = dreq->dreq_isr;
+               dccp_update_gsr(newsk, dreq->dreq_isr);
+
                /*
                 * SWL and AWL are initially adjusted so that they are not less than
                 * the initial Sequence Numbers received and sent, respectively:
@@ -216,7 +216,7 @@ struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb,
                         * counter (backoff, monitored by dccp_response_timer).
                         */
                        req->retrans++;
-                       req->rsk_ops->rtx_syn_ack(sk, req, NULL);
+                       req->rsk_ops->rtx_syn_ack(sk, req);
                }
                /* Network Duplicate, discard packet */
                return NULL;