git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
net
/
dccp
/
ipv4.c
diff --git
a/net/dccp/ipv4.c
b/net/dccp/ipv4.c
index
3fc75db
..
fee9a8c
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 =