diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-29 10:14:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-29 10:15:51 -0500 |
| commit | 3e3ab9ccca5b50b11bd4d16c2048b667343354bd (patch) | |
| tree | 7279f7401e7cc2b93fb7cb2bff894b5385429a68 /net/dccp/ccids/ccid2.c | |
| parent | 868c36dcc949c26bc74fa4661b670d9acc6489e4 (diff) | |
| parent | ba804bb4b72e57374b5f567b783aa0298fba0ce6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ccids/ccid2.c')
| -rw-r--r-- | net/dccp/ccids/ccid2.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c index 1c75cd1255f6..92d016e87816 100644 --- a/net/dccp/ccids/ccid2.c +++ b/net/dccp/ccids/ccid2.c | |||
| @@ -140,6 +140,9 @@ static void ccid2_hc_tx_rto_expire(struct timer_list *t) | |||
| 140 | 140 | ||
| 141 | ccid2_pr_debug("RTO_EXPIRE\n"); | 141 | ccid2_pr_debug("RTO_EXPIRE\n"); |
| 142 | 142 | ||
| 143 | if (sk->sk_state == DCCP_CLOSED) | ||
| 144 | goto out; | ||
| 145 | |||
| 143 | /* back-off timer */ | 146 | /* back-off timer */ |
| 144 | hc->tx_rto <<= 1; | 147 | hc->tx_rto <<= 1; |
| 145 | if (hc->tx_rto > DCCP_RTO_MAX) | 148 | if (hc->tx_rto > DCCP_RTO_MAX) |