Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

[karo-tx-linux.git] / net / dccp / ipv4.c

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 3fc75dbee4b8e4d068a0b4598fc96900c5a90842..fee9a8c3777b3b8a8a35de2be2b1a6789ac69ce3 100644 (file)
--- 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 =