diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 14:25:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 14:25:22 -0700 |
commit | 1d8674edb534a3c5cb549bfde5a39fa5598cb3bc (patch) | |
tree | 2fe4a39c0d4a26400d8b89e800ba596f1de88ec7 /net/dccp/minisocks.c | |
parent | d99901d6fdfb4098b9996de89ffbbae890e08288 (diff) | |
parent | cb7b593c2c808b32a1ea188599713c434b95f849 (diff) | |
download | linux-1d8674edb534a3c5cb549bfde5a39fa5598cb3bc.tar.bz2 |
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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c index ce5dff4ac22e..18461bc04cbe 100644 --- a/net/dccp/minisocks.c +++ b/net/dccp/minisocks.c @@ -96,6 +96,7 @@ struct sock *dccp_create_openreq_child(struct sock *sk, newdp->dccps_hc_rx_ackpkts = NULL; newdp->dccps_role = DCCP_ROLE_SERVER; newicsk->icsk_rto = DCCP_TIMEOUT_INIT; + do_gettimeofday(&newdp->dccps_epoch); if (newdp->dccps_options.dccpo_send_ack_vector) { newdp->dccps_hc_rx_ackpkts = |