diff options
Diffstat (limited to 'kernel/include/linux/netfilter/ipset/ip_set_compat.h.in')
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in index 6bd24e5..a6f9093 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in @@ -35,6 +35,9 @@ #@HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H@ HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H #@HAVE_TC_SKB_PROTOCOL@ HAVE_TC_SKB_PROTOCOL #@HAVE_NET_IN_XT_ACTION_PARAM@ HAVE_NET_IN_XT_ACTION_PARAM +#@HAVE_STATE_IN_XT_ACTION_PARAM@ HAVE_STATE_IN_XT_ACTION_PARAM +#@HAVE_XT_FAMILY@ HAVE_XT_FAMILY +#@HAVE_XT_NET@ HAVE_XT_NET #ifdef HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H #include <linux/module.h> @@ -285,12 +288,26 @@ static inline __be16 tc_skb_protocol(const struct sk_buff *skb) } #endif -#ifdef HAVE_NET_IN_XT_ACTION_PARAM +#ifdef HAVE_XT_NET +#define IPSET_DEV_NET(par) xt_net(par) +#elif defined(HAVE_NET_IN_XT_ACTION_PARAM) #define IPSET_DEV_NET(par) (par)->net #else #define IPSET_DEV_NET(par) dev_net((par)->in ? (par)->in : (par)->out) #endif +#ifdef HAVE_STATE_IN_XT_ACTION_PARAM +#define XAP_STATE(par) (par->state) +#else +#define XAP_STATE(par) par +#endif + +#ifdef HAVE_XT_FAMILY +#define XT_FAMILY(par) xt_family(par) +#else +#define XT_FAMILY(par) (par)->family +#endif + #ifndef smp_mb__before_atomic #define smp_mb__before_atomic() smp_mb() #define smp_mb__after_atomic() smp_mb() |