diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-03-20 17:35:13 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-03-20 17:35:13 -0800 |
| commit | aa5d7df3b20e0e493e90e1151510ab3ae8366bb5 (patch) | |
| tree | 1decadd46dd3d3dd88c9e812c46293398a79d1ab /net | |
| parent | 9833d6da00c95e8a471411fb079da6b25787b05e (diff) | |
| download | linux-aa5d7df3b20e0e493e90e1151510ab3ae8366bb5.tar.gz linux-aa5d7df3b20e0e493e90e1151510ab3ae8366bb5.tar.bz2 linux-aa5d7df3b20e0e493e90e1151510ab3ae8366bb5.zip | |
[DCCP] CCID3: Set the no_feedback_timer fields near init_timer
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/dccp/ccids/ccid3.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c index 3c4779fa9432..f9e16db09bef 100644 --- a/net/dccp/ccids/ccid3.c +++ b/net/dccp/ccids/ccid3.c @@ -307,8 +307,6 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, switch (hctx->ccid3hctx_state) { case TFRC_SSTATE_NO_SENT: - hctx->ccid3hctx_no_feedback_timer.function = ccid3_hc_tx_no_feedback_timer; - hctx->ccid3hctx_no_feedback_timer.data = (unsigned long)sk; sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer, jiffies + usecs_to_jiffies(TFRC_INITIAL_TIMEOUT)); hctx->ccid3hctx_last_win_count = 0; @@ -672,6 +670,9 @@ static int ccid3_hc_tx_init(struct sock *sk) hctx->ccid3hctx_t_rto = USEC_PER_SEC; hctx->ccid3hctx_state = TFRC_SSTATE_NO_SENT; INIT_LIST_HEAD(&hctx->ccid3hctx_hist); + + hctx->ccid3hctx_no_feedback_timer.function = ccid3_hc_tx_no_feedback_timer; + hctx->ccid3hctx_no_feedback_timer.data = (unsigned long)sk; init_timer(&hctx->ccid3hctx_no_feedback_timer); return 0; |