diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-01-05 03:04:58 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-01-05 03:06:46 +0100 |
| commit | e63c1822ac32a865dd02a18107fc933fd7b30f6f (patch) | |
| tree | 3d3875012e8412080a5ecc5f71d8f7e849bd4a95 /include/net/tcp.h | |
| parent | Merge tag 'wireless-next-2024-01-03' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | Merge tag 'net-6.7-rc9' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-e63c1822ac32a865dd02a18107fc933fd7b30f6f.tar.xz linux-e63c1822ac32a865dd02a18107fc933fd7b30f6f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
drivers/net/ethernet/broadcom/bnxt/bnxt.c
e009b2efb7a8 ("bnxt_en: Remove mis-applied code from bnxt_cfg_ntp_filters()")
0f2b21477988 ("bnxt_en: Fix compile error without CONFIG_RFS_ACCEL")
https://lore.kernel.org/all/20240105115509.225aa8a2@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/net/tcp.h')
| -rw-r--r-- | include/net/tcp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index f5ca4abaee8b..dd78a1181031 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1792,8 +1792,6 @@ struct tcp_md5sig_key *tcp_v4_md5_lookup(const struct sock *sk, const struct sock *addr_sk); #ifdef CONFIG_TCP_MD5SIG -#include <linux/jump_label.h> -extern struct static_key_false_deferred tcp_md5_needed; struct tcp_md5sig_key *__tcp_md5_do_lookup(const struct sock *sk, int l3index, const union tcp_md5_addr *addr, int family, bool any_l3index); |