diff options
| author |   Florian Westphal <fw@strlen.de> | 2021-09-24 14:12:37 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-09-25 11:36:51 +0100 |
| commit | 9e65b6a5aaa3236488b4f4e3e8b914d73124a5a5 (patch) | |
| tree | 56cc227a68d6ef5b3e0e4b3f12231a21fada3e4a /net/mptcp/protocol.h | |
| parent | mptcp: use lockdep_assert_held_once() instead of open-coding it (diff) | |
| download | linux-dev-9e65b6a5aaa3236488b4f4e3e8b914d73124a5a5.tar.xz linux-dev-9e65b6a5aaa3236488b4f4e3e8b914d73124a5a5.zip | |
mptcp: remove tx_pending_data
The update on recovery is not correct.
msk->tx_pending_data += msk->snd_nxt - rtx_head->data_seq;
will update tx_pending_data multiple times when a subflow is declared
stale while earlier recovery is still in progress.
This means that tx_pending_data will still be positive even after
all data as has been transmitted.
Rather than fix it, remove this field: there are no consumers.
The outstanding data byte count can be computed either via
"msk->write_seq - rtx_head->data_seq" or
"msk->write_seq - msk->snd_una".
The latter is more recent/accurate estimate as rtx_head adjustment
is deferred until mptcp lock can be acquired.
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/mptcp/protocol.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index d3e6fd1615f1..d516fb6578cc 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -254,7 +254,6 @@ struct mptcp_sock { struct sk_buff *ooo_last_skb; struct rb_root out_of_order_queue; struct sk_buff_head receive_queue; - int tx_pending_data; struct list_head conn_list; struct list_head rtx_queue; struct mptcp_data_frag *first_pending; |