summaryrefslogtreecommitdiff
path: root/net/dccp/timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/dccp/timer.c')
-rw-r--r--net/dccp/timer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/dccp/timer.c b/net/dccp/timer.c
index a4cfb47b60e5..232ac4ae0a73 100644
--- a/net/dccp/timer.c
+++ b/net/dccp/timer.c
@@ -139,9 +139,9 @@ static void dccp_write_timer(struct timer_list *t)
if (sk->sk_state == DCCP_CLOSED || !icsk->icsk_pending)
goto out;
- if (time_after(icsk->icsk_timeout, jiffies)) {
+ if (time_after(icsk_timeout(icsk), jiffies)) {
sk_reset_timer(sk, &icsk->icsk_retransmit_timer,
- icsk->icsk_timeout);
+ icsk_timeout(icsk));
goto out;
}
@@ -185,9 +185,9 @@ static void dccp_delack_timer(struct timer_list *t)
if (sk->sk_state == DCCP_CLOSED ||
!(icsk->icsk_ack.pending & ICSK_ACK_TIMER))
goto out;
- if (time_after(icsk->icsk_ack.timeout, jiffies)) {
+ if (time_after(icsk_delack_timeout(icsk), jiffies)) {
sk_reset_timer(sk, &icsk->icsk_delack_timer,
- icsk->icsk_ack.timeout);
+ icsk_delack_timeout(icsk));
goto out;
}