mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
[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>
This commit is contained in:
parent
9833d6da00
commit
aa5d7df3b2
1 changed files with 3 additions and 2 deletions
|
@ -307,8 +307,6 @@ static int ccid3_hc_tx_send_packet(struct sock *sk,
|
||||||
|
|
||||||
switch (hctx->ccid3hctx_state) {
|
switch (hctx->ccid3hctx_state) {
|
||||||
case TFRC_SSTATE_NO_SENT:
|
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,
|
sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer,
|
||||||
jiffies + usecs_to_jiffies(TFRC_INITIAL_TIMEOUT));
|
jiffies + usecs_to_jiffies(TFRC_INITIAL_TIMEOUT));
|
||||||
hctx->ccid3hctx_last_win_count = 0;
|
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_t_rto = USEC_PER_SEC;
|
||||||
hctx->ccid3hctx_state = TFRC_SSTATE_NO_SENT;
|
hctx->ccid3hctx_state = TFRC_SSTATE_NO_SENT;
|
||||||
INIT_LIST_HEAD(&hctx->ccid3hctx_hist);
|
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);
|
init_timer(&hctx->ccid3hctx_no_feedback_timer);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue