netfilter: inline four headers files into another one.
authorJeremy Sowden <jeremy@azazel.net>
Wed, 7 Aug 2019 14:16:58 +0000 (15:16 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 13 Aug 2019 10:14:26 +0000 (12:14 +0200)
commitbd96b4c75675e616eefef6d85d163530eef9c5e5
tree8640ebe613e76d69a0f2108965fc3e699bcab6ed
parent43dd16efc7f235f153804500a4363769bd2276fc
netfilter: inline 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 <jeremy@azazel.net>
Acked-by: Jozsef Kadlecsik <kadlec@netfilter.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/linux/netfilter/ipset/ip_set.h
include/linux/netfilter/ipset/ip_set_comment.h [deleted file]
include/linux/netfilter/ipset/ip_set_counter.h [deleted file]
include/linux/netfilter/ipset/ip_set_skbinfo.h [deleted file]
include/linux/netfilter/ipset/ip_set_timeout.h [deleted file]
net/netfilter/ipset/ip_set_hash_gen.h
net/netfilter/xt_set.c