Commit 8bf3cbe3 authored by Jeremy Sowden's avatar Jeremy Sowden Committed by Pablo Neira Ayuso
Browse files

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: default avatarJeremy Sowden <jeremy@azazel.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 40d102cd

include/net/netfilter/ipv6/nf_conntrack_icmpv6.h

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * ICMPv6 tracking.

 *

 * 21 Apl 2004: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai@toshiba.co.jp>

 *	- separated from nf_conntrack_icmp.h

 *

 * Derived from include/linux/netfiter_ipv4/ip_conntrack_icmp.h

 */



#ifndef _NF_CONNTRACK_ICMPV6_H

#define _NF_CONNTRACK_ICMPV6_H



#ifndef ICMPV6_NI_QUERY

#define ICMPV6_NI_QUERY 139

#endif

#ifndef ICMPV6_NI_REPLY

#define ICMPV6_NI_REPLY 140

#endif



#endif /* _NF_CONNTRACK_ICMPV6_H */

include/net/netfilter/nf_conntrack.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/netfilter/nf_conntrack_dccp.h>

#include <linux/netfilter/nf_conntrack_sctp.h>

#include <linux/netfilter/nf_conntrack_proto_gre.h>

#include <net/netfilter/ipv6/nf_conntrack_icmpv6.h>



#include <net/netfilter/nf_conntrack_tuple.h>

net/netfilter/nf_conntrack_proto_icmpv6.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <net/netfilter/nf_conntrack_core.h>

#include <net/netfilter/nf_conntrack_timeout.h>

#include <net/netfilter/nf_conntrack_zones.h>

#include <net/netfilter/ipv6/nf_conntrack_icmpv6.h>

#include <net/netfilter/nf_log.h>



static const unsigned int nf_ct_icmpv6_timeout = 30*HZ;