diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-10-26 03:50:02 -0700 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-26 03:50:02 -0700 |
commit | 8c56a347c1dfbe384b1ffb65d8828faa36dbaea4 (patch) | |
tree | 44dfa8621b387fc76168db3858996466b278f38e /net/dccp/ccids/ccid2.c | |
parent | d892afe2ca905ddb00a4f16927c8b465cdd31b20 (diff) | |
parent | 24c667db59a9cc4caaafe4f77f6f4ef85899a454 (diff) | |
download | kernel-crypto-8c56a347c1dfbe384b1ffb65d8828faa36dbaea4.tar.gz kernel-crypto-8c56a347c1dfbe384b1ffb65d8828faa36dbaea4.tar.xz kernel-crypto-8c56a347c1dfbe384b1ffb65d8828faa36dbaea4.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
Diffstat (limited to 'net/dccp/ccids/ccid2.c')
-rw-r--r-- | net/dccp/ccids/ccid2.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c index 426008e3b7e..d694656b880 100644 --- a/net/dccp/ccids/ccid2.c +++ b/net/dccp/ccids/ccid2.c @@ -750,20 +750,16 @@ static int ccid2_hc_tx_init(struct ccid *ccid, struct sock *sk) */ hctx->ccid2hctx_ssthresh = ~0; hctx->ccid2hctx_numdupack = 3; - hctx->ccid2hctx_seqbufc = 0; /* XXX init ~ to window size... */ if (ccid2_hc_tx_alloc_seq(hctx)) return -ENOMEM; - hctx->ccid2hctx_sent = 0; hctx->ccid2hctx_rto = 3 * HZ; ccid2_change_srtt(hctx, -1); hctx->ccid2hctx_rttvar = -1; - hctx->ccid2hctx_lastrtt = 0; hctx->ccid2hctx_rpdupack = -1; hctx->ccid2hctx_last_cong = jiffies; - hctx->ccid2hctx_high_ack = 0; hctx->ccid2hctx_rtotimer.function = &ccid2_hc_tx_rto_expire; hctx->ccid2hctx_rtotimer.data = (unsigned long)sk; |