summaryrefslogtreecommitdiffstats
path: root/net/dccp/minisocks.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2005-09-09 13:17:43 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2005-09-09 13:17:43 -0700
commit8259f1625789ad03e6451ecef3e690af52e8e802 (patch)
tree079dd05df0542d98074a27c9a358dc8f0735c23b /net/dccp/minisocks.c
parent5dce225bd9ea60e28e17076de63df0dee51b2883 (diff)
parent59725dc2a2e86a03bbf97976ede3bdc6f95bba92 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
Diffstat (limited to 'net/dccp/minisocks.c')
-rw-r--r--net/dccp/minisocks.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index ce5dff4ac22..18461bc04cb 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 =