summaryrefslogtreecommitdiffstats
path: root/net/mptcp/protocol.c
diff options
context:
space:
mode:
authorGeliang Tang <geliangtang@gmail.com>2020-09-24 02:29:57 +0200
committerDavid S. Miller <davem@davemloft.net>2020-09-25 04:58:34 +0200
commit5c8c1640956e59797f838fb18495e3d3fb964205 (patch)
tree8279cc18cd89e3a121242ffa46aa9f0722b9772d /net/mptcp/protocol.c
parentmptcp: add RM_ADDR related mibs (diff)
downloadlinux-5c8c1640956e59797f838fb18495e3d3fb964205.tar.xz
linux-5c8c1640956e59797f838fb18495e3d3fb964205.zip
mptcp: add mptcp_destroy_common helper
This patch added a new helper named mptcp_destroy_common containing the shared code between mptcp_destroy() and mptcp_sock_destruct(). Suggested-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Geliang Tang <geliangtang@gmail.com> Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp/protocol.c')
-rw-r--r--net/mptcp/protocol.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index b53e55826975..34c037731f35 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -2128,16 +2128,21 @@ static struct sock *mptcp_accept(struct sock *sk, int flags, int *err,
return newsk;
}
+void mptcp_destroy_common(struct mptcp_sock *msk)
+{
+ skb_rbtree_purge(&msk->out_of_order_queue);
+ mptcp_token_destroy(msk);
+ mptcp_pm_free_anno_list(msk);
+}
+
static void mptcp_destroy(struct sock *sk)
{
struct mptcp_sock *msk = mptcp_sk(sk);
- skb_rbtree_purge(&msk->out_of_order_queue);
- mptcp_token_destroy(msk);
if (msk->cached_ext)
__skb_ext_put(msk->cached_ext);
- mptcp_pm_free_anno_list(msk);
+ mptcp_destroy_common(msk);
sk_sockets_allocated_dec(sk);
}