From 2f9737408b8857dd9dbec2293141a28d268638ff Mon Sep 17 00:00:00 2001 From: Jeremy Sowden Date: Mon, 7 Oct 2019 21:08:42 +0200 Subject: netfilter: inlined four headers files into another one. linux/netfilter/ipset/ip_set.h included four other header files: include/linux/netfilter/ipset/ip_set_comment.h include/linux/netfilter/ipset/ip_set_counter.h include/linux/netfilter/ipset/ip_set_skbinfo.h include/linux/netfilter/ipset/ip_set_timeout.h Of these the first three were not included anywhere else. The last, ip_set_timeout.h, was included in a couple of other places, but defined inline functions which call other inline functions defined in ip_set.h, so ip_set.h had to be included before it. Inlined all four into ip_set.h, and updated the other files that included ip_set_timeout.h. Signed-off-by: Jeremy Sowden Signed-off-by: Jozsef Kadlecsik --- kernel/net/netfilter/ipset/ip_set_hash_gen.h | 2 +- kernel/net/netfilter/xt_set.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'kernel/net') diff --git a/kernel/net/netfilter/ipset/ip_set_hash_gen.h b/kernel/net/netfilter/ipset/ip_set_hash_gen.h index cd2b618..c42b303 100644 --- a/kernel/net/netfilter/ipset/ip_set_hash_gen.h +++ b/kernel/net/netfilter/ipset/ip_set_hash_gen.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #define __ipset_dereference_protected(p, c) rcu_dereference_protected(p, c) #define ipset_dereference_protected(p, set) \ diff --git a/kernel/net/netfilter/xt_set.c b/kernel/net/netfilter/xt_set.c index 8377614..f5c0af7 100644 --- a/kernel/net/netfilter/xt_set.c +++ b/kernel/net/netfilter/xt_set.c @@ -17,7 +17,6 @@ #include #include -#include #include MODULE_LICENSE("GPL"); -- cgit v1.2.3