tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

netfilter: remove nf_conntrack_icmpv6.h header.

nf_conntrack_icmpv6.h contains two object macros which duplicate macros
in linux/icmpv6.h. The latter definitions are also visible wherever it
is included, so remove it.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Jeremy Sowden and committed by
Pablo Neira Ayuso 8bf3cbe3 40d102cd

-23
-21
include/net/netfilter/ipv6/nf_conntrack_icmpv6.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 - /* 3 - * ICMPv6 tracking. 4 - * 5 - * 21 Apl 2004: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai@toshiba.co.jp> 6 - * - separated from nf_conntrack_icmp.h 7 - * 8 - * Derived from include/linux/netfiter_ipv4/ip_conntrack_icmp.h 9 - */ 10 - 11 - #ifndef _NF_CONNTRACK_ICMPV6_H 12 - #define _NF_CONNTRACK_ICMPV6_H 13 - 14 - #ifndef ICMPV6_NI_QUERY 15 - #define ICMPV6_NI_QUERY 139 16 - #endif 17 - #ifndef ICMPV6_NI_REPLY 18 - #define ICMPV6_NI_REPLY 140 19 - #endif 20 - 21 - #endif /* _NF_CONNTRACK_ICMPV6_H */
-1
include/net/netfilter/nf_conntrack.h
··· 23 23 #include <linux/netfilter/nf_conntrack_dccp.h> 24 24 #include <linux/netfilter/nf_conntrack_sctp.h> 25 25 #include <linux/netfilter/nf_conntrack_proto_gre.h> 26 - #include <net/netfilter/ipv6/nf_conntrack_icmpv6.h> 27 26 28 27 #include <net/netfilter/nf_conntrack_tuple.h> 29 28
-1
net/netfilter/nf_conntrack_proto_icmpv6.c
··· 22 22 #include <net/netfilter/nf_conntrack_core.h> 23 23 #include <net/netfilter/nf_conntrack_timeout.h> 24 24 #include <net/netfilter/nf_conntrack_zones.h> 25 - #include <net/netfilter/ipv6/nf_conntrack_icmpv6.h> 26 25 #include <net/netfilter/nf_log.h> 27 26 28 27 static const unsigned int nf_ct_icmpv6_timeout = 30*HZ;