diff options
author | David S. Miller <davem@davemloft.net> | 2021-04-17 03:10:40 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2021-04-17 03:10:40 +0300 |
commit | 474f459360399c5becfd0f189a8894e9e17ad3d3 (patch) | |
tree | 4ac2215add7c9db2a6b0ffcb02f1d63481c82b7b /net/mptcp/crypto.c | |
parent | 820dd7a244fe2d990d414172110f36cf5e8a936a (diff) | |
parent | 442279154c73bc681e5346bdd1270a628dfdfdc7 (diff) | |
download | linux-474f459360399c5becfd0f189a8894e9e17ad3d3.tar.xz |
Merge branch 'mptcp-fixes-and-tracepoints'
Mat Martineau says:
====================
mptcp: Fixes and tracepoints from the mptcp tree
Here's one more batch of changes that we've tested out in the MPTCP tree.
Patch 1 makes the MPTCP KUnit config symbol more consistent with other
subsystems.
Patch 2 fixes a couple of format specifiers in pr_debug()s
Patches 3-7 add four helpful tracepoints for MPTCP.
Patch 8 is a one-line refactor to use an available helper macro.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp/crypto.c')
-rw-r--r-- | net/mptcp/crypto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mptcp/crypto.c b/net/mptcp/crypto.c index b472dc149856..a8931349933c 100644 --- a/net/mptcp/crypto.c +++ b/net/mptcp/crypto.c @@ -78,6 +78,6 @@ void mptcp_crypto_hmac_sha(u64 key1, u64 key2, u8 *msg, int len, void *hmac) sha256(input, SHA256_BLOCK_SIZE + SHA256_DIGEST_SIZE, hmac); } -#if IS_MODULE(CONFIG_MPTCP_KUNIT_TESTS) +#if IS_MODULE(CONFIG_MPTCP_KUNIT_TEST) EXPORT_SYMBOL_GPL(mptcp_crypto_hmac_sha); #endif |