]> git.ipfire.org Git - thirdparty/ipset.git/commit
netfilter: inlined four headers files into another one.
authorJeremy Sowden <jeremy@azazel.net>
Mon, 7 Oct 2019 19:08:42 +0000 (21:08 +0200)
committerJozsef Kadlecsik <kadlec@netfilter.org>
Mon, 7 Oct 2019 19:49:12 +0000 (21:49 +0200)
commit2f9737408b8857dd9dbec2293141a28d268638ff
tree90df751bef8c0e6d5c5e4c9f226425aa3ef7e5b1
parent7d9883dcdd90f09b8c0fb82781e74f1755966d3e
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 <jeremy@azazel.net>
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
kernel/include/linux/netfilter/ipset/ip_set.h
kernel/include/linux/netfilter/ipset/ip_set_comment.h [deleted file]
kernel/include/linux/netfilter/ipset/ip_set_counter.h [deleted file]
kernel/include/linux/netfilter/ipset/ip_set_skbinfo.h [deleted file]
kernel/include/linux/netfilter/ipset/ip_set_timeout.h [deleted file]
kernel/net/netfilter/ipset/ip_set_hash_gen.h
kernel/net/netfilter/xt_set.c