Skip to contentSkip to conversation

Squash-to: "mptcp: add MPTCP socket diag interface"

PATCH In review Paolo Abeni 2 participants 2 messages Jul 7, 2020 – Jul 9, 2020

Subsystems (2)
lore
Share & tools
lore

Paolo Abeni

author
#0 lore raw

PATCH 1/1 Squash-to: "mptcp: add MPTCP socket diag interface"

Davide reported build issues when compiling without CONFIG_MPTCP_KUNIT_TESTS. We need to always export mptcp_token_get_sock(), for diag's sake.

The following text should be inserted into the squash to commit:
"""
Additionally export mptcp_token_get_sock(), as it also will be used by the diag module.
"""

just before:
"""
It will be used by the next patch, but keep the API generic, as we plan to use this later for PM's sake.
"""

Signed-off-by Paolo Abeni <pabeni(a)redhat.com>
---
 net/mptcp/token.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/mptcp/token.c +1 -1
index 6d4fe70f7d30..7d8106026081 100644
@@ -238,6 +238,7 @@ struct mptcp_sock *mptcp_token_get_sock(u32 token)
 	rcu_read_unlock();
 	return msk;
 }
+EXPORT_SYMBOL_GPL(mptcp_token_get_sock);
 
 /**
  * mptcp_token_iter_next - iterate over the token container from given pos
@@ -371,7 +372,6 @@ void __init mptcp_token_init(void)
 EXPORT_SYMBOL_GPL(mptcp_token_new_request);
 EXPORT_SYMBOL_GPL(mptcp_token_new_connect);
 EXPORT_SYMBOL_GPL(mptcp_token_accept);
-EXPORT_SYMBOL_GPL(mptcp_token_get_sock);
 EXPORT_SYMBOL_GPL(mptcp_token_destroy_request);
 EXPORT_SYMBOL_GPL(mptcp_token_destroy);
 #endif
Signature · 1 line
2.18.1
#1 lore raw

Hi Paolo, Davide,

Quoted 11 lines · Paolo Abeni

Davide reported build issues when compiling without CONFIG_MPTCP_KUNIT_TESTS. We need to always export mptcp_token_get_sock(), for diag's sake.

The following text should be inserted into the squash to commit:
"""
Additionally export mptcp_token_get_sock(), as it also will be used by the diag module.
"""

Quoted 5 lines

just before:
"""
It will be used by the next patch, but keep the API generic, as we plan to use this later for PM's sake.
"""

Thank you for the patch and the instructions!

I guess you wanted me to squash the patch in "mptcp: add msk interations helper" commit, not in "mptcp: add MPTCP socket diag interface", right?

- 9b8b971fb7cb: "squashed" in "mptcp: add msk interations helper"
- 5ed0672e64fa: tg:msg: info about mptcp_token_get_sock()
- 287977a070ee..e08dbaf46bc8: result

Tests and export are in progress!

Cheers,
Matt

Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net