| Message ID | 20200707171327.180346-1-pabeni@redhat.com |
|---|---|
| State | Accepted, archived |
| Commit | 9b8b971fb7cbb904c5964ed436da497253f423c8 |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | Squash-to: "mptcp: add MPTCP socket diag interface" | expand |
Hi Paolo, Davide, On 07/07/2020 19:13, Paolo Abeni wrote: > 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. > """ 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
diff --git a/net/mptcp/token.c b/net/mptcp/token.c index 6d4fe70f7d30..7d8106026081 100644 --- a/net/mptcp/token.c +++ b/net/mptcp/token.c @@ -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
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@redhat.com> --- net/mptcp/token.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)