diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-11 17:53:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-11 17:53:04 -0700 |
| commit | 5cb960a80531211379f8f05c575725d7630098fe (patch) | |
| tree | aee22f43cf5c2ae26a6994e6aa5c427285ff0ff4 /net/dccp/minisocks.c | |
| parent | ceeff7541e5a4ba8e8d97ffbae32b3f283cb7a3f (diff) | |
| parent | be4c798a41bf626cdaacf96c382f116ed2f7dbe9 (diff) | |
Merge branch 'master' of git://eden-feed.erg.abdn.ac.uk/net-2.6
Diffstat (limited to 'net/dccp/minisocks.c')
| -rw-r--r-- | net/dccp/minisocks.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c index 33ad48321b0..66dca5bba85 100644 --- 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: |