summaryrefslogtreecommitdiff
path: root/net/dccp/ipv4.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-07-29 08:28:36 +0400
committerJeff Garzik <jeff@garzik.org>2006-07-29 08:28:36 +0400
commit572e432e01c1f7c64ad8375a6e0d935b0e40ebf5 (patch)
tree57ae4168e9bf4c88a1267f4ec6c96df3789cc9cc /net/dccp/ipv4.c
parentd11ea48aab3b57cc931cc7120603e1c2ffb04302 (diff)
parente3f2ddeac718c768fdac4b7fe69d465172f788a8 (diff)
downloadlinux-572e432e01c1f7c64ad8375a6e0d935b0e40ebf5.tar.xz
Merge branch 'master' into upstream
Diffstat (limited to 'net/dccp/ipv4.c')
-rw-r--r--net/dccp/ipv4.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index c3073e7e81d3..7f56f7e8f571 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -504,8 +504,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
ireq = inet_rsk(req);
ireq->loc_addr = daddr;
ireq->rmt_addr = saddr;
- req->rcv_wnd = 100; /* Fake, option parsing will get the
- right value */
+ req->rcv_wnd = dccp_feat_default_sequence_window;
ireq->opt = NULL;
/*