diff options
| author | Jakub Kicinski <[email protected]> | 2022-03-09 20:01:20 -0800 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2022-03-09 20:01:20 -0800 |
| commit | c01e605904f1c8e25cfaecf04edaaa2824674065 (patch) | |
| tree | 2772d34dcd633587e2ff997adcd38d6670da29cd /include | |
| parent | 4a5eaa2fde59d08d0ca14f985a61c6c745555bbb (diff) | |
| parent | b23f9239195a1af116d6b388cd00c9002f80f80f (diff) | |
Merge branch 'net-fungible-fix-errors-when-config_tls_device-n'
Dimitris Michailidis says:
====================
net/fungible: fix errors when CONFIG_TLS_DEVICE=n
This pair of patches fix compile errors in funeth when
CONFIG_TLS_DEVICE=n. The errors are due to symbols that are not defined
in this config but are used in code guarded by
"if (IS_ENABLED(CONFIG_TLS_DEVICE) ..."
One option is to place this code under preprocessor guards that will
keep the compiler from looking at the code. The option adopted here is
to define the offending symbols also when CONFIG_TLS_DEVICE=n.
The first patch does this for two functions in tls.h.
The second does the same for driver symbols and makes tls.h inclusion
unconditional.
====================
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/tls.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/tls.h b/include/net/tls.h index 526cb2c3b724..b6968a5b5538 100644 --- a/include/net/tls.h +++ b/include/net/tls.h @@ -626,7 +626,6 @@ tls_offload_ctx_rx(const struct tls_context *tls_ctx) return (struct tls_offload_context_rx *)tls_ctx->priv_ctx_rx; } -#if IS_ENABLED(CONFIG_TLS_DEVICE) static inline void *__tls_driver_ctx(struct tls_context *tls_ctx, enum tls_offload_ctx_dir direction) { @@ -641,7 +640,6 @@ tls_driver_ctx(const struct sock *sk, enum tls_offload_ctx_dir direction) { return __tls_driver_ctx(tls_get_ctx(sk), direction); } -#endif #define RESYNC_REQ BIT(0) #define RESYNC_REQ_ASYNC BIT(1) |