summaryrefslogtreecommitdiff
path: root/net/dccp/ipv4.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2005-09-10 00:17:43 +0400
committerDavid S. Miller <davem@sunset.davemloft.net>2005-09-10 00:17:43 +0400
commit8259f1625789ad03e6451ecef3e690af52e8e802 (patch)
tree079dd05df0542d98074a27c9a358dc8f0735c23b /net/dccp/ipv4.c
parent5dce225bd9ea60e28e17076de63df0dee51b2883 (diff)
parent59725dc2a2e86a03bbf97976ede3bdc6f95bba92 (diff)
downloadlinux-8259f1625789ad03e6451ecef3e690af52e8e802.tar.xz
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
Diffstat (limited to 'net/dccp/ipv4.c')
-rw-r--r--net/dccp/ipv4.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 3fc75dbee4b8..fee9a8c3777b 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -1243,6 +1243,7 @@ static int dccp_v4_init_sock(struct sock *sk)
static int dccp_ctl_socket_init = 1;
dccp_options_init(&dp->dccps_options);
+ do_gettimeofday(&dp->dccps_epoch);
if (dp->dccps_options.dccpo_send_ack_vector) {
dp->dccps_hc_rx_ackpkts =