diff options
| author | Jakub Kicinski <[email protected]> | 2023-11-29 20:16:42 -0800 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2023-11-29 20:17:23 -0800 |
| commit | e35174263f2c671603e8ccc997a16334087b782c (patch) | |
| tree | 51ab8ee1bc85d5af40c50c6d6cbd84b5d0a9ce47 /include/linux | |
| parent | f422544118cbdfc3bba7b7c5189e18147acb9047 (diff) | |
| parent | 8e7bab6b9652cd07a05ee0380b623c0e00e3eb00 (diff) | |
Merge branch 'clean-up-and-refactor-cookie_v46_check'
Kuniyuki Iwashima says:
====================
tcp: Clean up and refactor cookie_v[46]_check().
This is a preparation series for upcoming arbitrary SYN Cookie
support with BPF. [0]
There are slight differences between cookie_v[46]_check(). Such a
discrepancy caused an issue in the past, and BPF SYN Cookie support
will add more churn.
The primary purpose of this series is to clean up and refactor
cookie_v[46]_check() to minimise such discrepancies and make the
BPF series easier to review.
[0]: https://lore.kernel.org/netdev/[email protected]/
v2: https://lore.kernel.org/netdev/[email protected]/
v1: https://lore.kernel.org/netdev/[email protected]/
====================
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter_ipv6.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h index 7834c0be2831..61aa48f46dd7 100644 --- a/include/linux/netfilter_ipv6.h +++ b/include/linux/netfilter_ipv6.h @@ -51,7 +51,7 @@ struct nf_ipv6_ops { u32 (*cookie_init_sequence)(const struct ipv6hdr *iph, const struct tcphdr *th, u16 *mssp); int (*cookie_v6_check)(const struct ipv6hdr *iph, - const struct tcphdr *th, __u32 cookie); + const struct tcphdr *th); #endif void (*route_input)(struct sk_buff *skb); int (*fragment)(struct net *net, struct sock *sk, struct sk_buff *skb, @@ -179,16 +179,16 @@ static inline u32 nf_ipv6_cookie_init_sequence(const struct ipv6hdr *iph, } static inline int nf_cookie_v6_check(const struct ipv6hdr *iph, - const struct tcphdr *th, __u32 cookie) + const struct tcphdr *th) { #if IS_ENABLED(CONFIG_SYN_COOKIES) #if IS_MODULE(CONFIG_IPV6) const struct nf_ipv6_ops *v6_ops = nf_get_ipv6_ops(); if (v6_ops) - return v6_ops->cookie_v6_check(iph, th, cookie); + return v6_ops->cookie_v6_check(iph, th); #elif IS_BUILTIN(CONFIG_IPV6) - return __cookie_v6_check(iph, th, cookie); + return __cookie_v6_check(iph, th); #endif #endif return 0; |