diff options
| author | David S. Miller | 2005-09-18 09:17:10 +0200 |
|---|---|---|
| committer | David S. Miller | 2005-09-18 09:17:10 +0200 |
| commit | 21f130a2370ba837cdfc5204ebe52e7c664fec3d (patch) | |
| tree | 7f8a30088d8d39eab9350c59b6638661309ffe89 /net/dccp/minisocks.c | |
| parent | x86-64/smp: fix random SIGSEGV issues (diff) | |
| parent | [TG3]: Fix 4GB boundary tx handling (diff) | |
| download | kernel-qcow2-linux-21f130a2370ba837cdfc5204ebe52e7c664fec3d.tar.gz kernel-qcow2-linux-21f130a2370ba837cdfc5204ebe52e7c664fec3d.tar.xz kernel-qcow2-linux-21f130a2370ba837cdfc5204ebe52e7c664fec3d.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/dccp/minisocks.c')
| -rw-r--r-- | net/dccp/minisocks.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c index 18461bc04cbe..933e10db1789 100644 --- a/net/dccp/minisocks.c +++ b/net/dccp/minisocks.c @@ -93,9 +93,11 @@ struct sock *dccp_create_openreq_child(struct sock *sk, struct inet_connection_sock *newicsk = inet_csk(sk); struct dccp_sock *newdp = dccp_sk(newsk); + newdp->dccps_role = DCCP_ROLE_SERVER; newdp->dccps_hc_rx_ackpkts = NULL; - newdp->dccps_role = DCCP_ROLE_SERVER; - newicsk->icsk_rto = DCCP_TIMEOUT_INIT; + newdp->dccps_service_list = NULL; + newdp->dccps_service = dreq->dreq_service; + newicsk->icsk_rto = DCCP_TIMEOUT_INIT; do_gettimeofday(&newdp->dccps_epoch); if (newdp->dccps_options.dccpo_send_ack_vector) { |