compat_xtables.h (xtables-addons-3.12.tar.xz) | : | compat_xtables.h (xtables-addons-3.13.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 25 | skipping to change at line 25 | |||
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | |||
# if !defined(CONFIG_NF_CONNTRACK_MARK) | # if !defined(CONFIG_NF_CONNTRACK_MARK) | |||
# warning You have CONFIG_NF_CONNTRACK enabled, but CONFIG_NF_CONNT RACK_MARK is not (please enable). | # warning You have CONFIG_NF_CONNTRACK enabled, but CONFIG_NF_CONNT RACK_MARK is not (please enable). | |||
# endif | # endif | |||
# include <net/netfilter/nf_conntrack.h> | # include <net/netfilter/nf_conntrack.h> | |||
#else | #else | |||
# warning You need CONFIG_NF_CONNTRACK. | # warning You need CONFIG_NF_CONNTRACK. | |||
#endif | #endif | |||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0) || \ | #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0) || \ | |||
LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 9) && LINUX_VERSION_CODE < KERNEL | LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 9) && LINUX_VERSION_CODE < KERNEL | |||
_VERSION(5, 10, 0) | _VERSION(5, 10, 0) || \ | |||
LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 78) && LINUX_VERSION_CODE < KERNE | ||||
L_VERSION(5, 5, 0) || \ | ||||
LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 158) && LINUX_VERSION_CODE < KER | ||||
NEL_VERSION(4, 20, 0) | ||||
#else | #else | |||
# define ip_route_me_harder(xnet, xsk, xskb, xaddrtype) ip_route_me_harder( (xnet), (xskb), (xaddrtype)) | # define ip_route_me_harder(xnet, xsk, xskb, xaddrtype) ip_route_me_harder( (xnet), (xskb), (xaddrtype)) | |||
# define ip6_route_me_harder(xnet, xsk, xskb) ip6_route_me_harder((xnet), ( xskb)) | # define ip6_route_me_harder(xnet, xsk, xskb) ip6_route_me_harder((xnet), ( xskb)) | |||
#endif | #endif | |||
static inline struct net *par_net(const struct xt_action_param *par) | static inline struct net *par_net(const struct xt_action_param *par) | |||
{ | { | |||
return par->state->net; | return par->state->net; | |||
} | } | |||
End of changes. 1 change blocks. | ||||
2 lines changed or deleted | 6 lines changed or added |