diff options
| author | Joel Stanley <joel@jms.id.au> | 2020-08-04 10:58:32 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2020-08-04 10:58:36 +0300 |
| commit | 9524588381df213554a10d3661a9200a4b7f6db2 (patch) | |
| tree | a4d281b99dcd28b9a1d3077299c26a5671abff88 /net/tipc/link.c | |
| parent | 666e403461fd046b37bc95bba49e82ca6a758bea (diff) | |
| parent | 67da9e2c2b730b9b788ace749d22d769cf11ee2b (diff) | |
| download | linux-dev-5.7.tar.xz | |
Merge tag 'v5.7.12' into dev-5.7dev-5.7
This is the 5.7.12 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'net/tipc/link.c')
| -rw-r--r-- | net/tipc/link.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index d4675e922a8f..e18369201a15 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -813,11 +813,11 @@ int tipc_link_timeout(struct tipc_link *l, struct sk_buff_head *xmitq) state |= l->bc_rcvlink->rcv_unacked; state |= l->rcv_unacked; state |= !skb_queue_empty(&l->transmq); - state |= !skb_queue_empty(&l->deferdq); probe = mstate->probing; probe |= l->silent_intv_cnt; if (probe || mstate->monitoring) l->silent_intv_cnt++; + probe |= !skb_queue_empty(&l->deferdq); if (l->snd_nxt == l->checkpoint) { tipc_link_update_cwin(l, 0, 0); probe = true; |