diff options
| author | Serhey Popovych <serhe.popovych@gmail.com> | 2019-11-29 11:21:32 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@netfilter.org> | 2019-12-09 11:07:02 +0100 |
| commit | a065f8ed355f08131c39787b4c7a41543ff643b3 (patch) | |
| tree | 5bc04778f2d526dd57b783dc5bc570fa34659a76 /kernel/net/sched | |
| parent | 4eda9fd68157c444f70541bd10fde3c36e09f0f1 (diff) | |
em_ipset: Build on old kernels
Make sure TCF_EM_IPSET defined and corresponds to current upstream value
if not defined in target kernel. You need iproute2 version that supports
em_ipset to communicate correctly. Include ip_set_compat.h after
pkt_cls.h to prevent TCF_EM_IPSET redefine error.
Detect skb->iif => skb->skb_iif rename after commit 8964be4a9a5c ("net:
rename skb->iif to skb->skb_iif").
Add dev_get_by_index_rcu() define pointing to __dev_get_by_index() to
build on RHEL6 kernels with explicit note that this may not work on all
architectures.
Always build em_ipset regardless of CONFIG_NET_EMATCH_IPSET option.
Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
Diffstat (limited to 'kernel/net/sched')
| -rw-r--r-- | kernel/net/sched/Kbuild | 2 | ||||
| -rw-r--r-- | kernel/net/sched/em_ipset.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/net/sched/Kbuild b/kernel/net/sched/Kbuild index 6d8e8d6..e93476c 100644 --- a/kernel/net/sched/Kbuild +++ b/kernel/net/sched/Kbuild @@ -1,4 +1,4 @@ NOSTDINC_FLAGS += -I$(KDIR)/include EXTRA_CFLAGS := -DCONFIG_IP_SET_MAX=$(IP_SET_MAX) -obj-$(CONFIG_NET_EMATCH_IPSET) += em_ipset.o +obj-m += em_ipset.o diff --git a/kernel/net/sched/em_ipset.c b/kernel/net/sched/em_ipset.c index bd9566f..96fd4a3 100644 --- a/kernel/net/sched/em_ipset.c +++ b/kernel/net/sched/em_ipset.c @@ -15,10 +15,10 @@ #include <linux/string.h> #include <linux/skbuff.h> #include <linux/netfilter/xt_set.h> -#include <linux/netfilter/ipset/ip_set_compat.h> #include <linux/ipv6.h> #include <net/ip.h> #include <net/pkt_cls.h> +#include <linux/netfilter/ipset/ip_set_compat.h> #ifdef HAVE_TCF_EMATCH_OPS_CHANGE_ARG_NET static int em_ipset_change(struct net *net, void *data, int data_len, |