Commit bf8981a2 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_nat: merge ip/ip6 masquerade headers 



Both are now implemented by nf_nat_masquerade.c, so no need to keep
different headers.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 3b0a081d

include/net/netfilter/ipv6/nf_nat_masquerade.h

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

#ifndef _NF_NAT_MASQUERADE_IPV6_H_

#define _NF_NAT_MASQUERADE_IPV6_H_



unsigned int

nf_nat_masquerade_ipv6(struct sk_buff *skb, const struct nf_nat_range2 *range,

		       const struct net_device *out);

int nf_nat_masquerade_ipv6_register_notifier(void);

void nf_nat_masquerade_ipv6_unregister_notifier(void);



#endif /* _NF_NAT_MASQUERADE_IPV6_H_ */

include/net/netfilter/ipv4/nf_nat_masquerade.h→include/net/netfilter/nf_nat_masquerade.h

+9 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _NF_NAT_MASQUERADE_IPV4_H_

#define _NF_NAT_MASQUERADE_IPV4_H_

#ifndef _NF_NAT_MASQUERADE_H_

#define _NF_NAT_MASQUERADE_H_



#include <net/netfilter/nf_nat.h>
@@ -12,4 +12,10 @@ nf_nat_masquerade_ipv4(struct sk_buff *skb, unsigned int hooknum, 
int nf_nat_masquerade_ipv4_register_notifier(void);

void nf_nat_masquerade_ipv4_unregister_notifier(void);



#endif /*_NF_NAT_MASQUERADE_IPV4_H_ */
 
unsigned int

nf_nat_masquerade_ipv6(struct sk_buff *skb, const struct nf_nat_range2 *range,

		       const struct net_device *out);

int nf_nat_masquerade_ipv6_register_notifier(void);

void nf_nat_masquerade_ipv6_unregister_notifier(void);



#endif /*_NF_NAT_MASQUERADE_H_ */

net/ipv4/netfilter/ipt_MASQUERADE.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <linux/netfilter_ipv4.h>

#include <linux/netfilter/x_tables.h>

#include <net/netfilter/nf_nat.h>

#include <net/netfilter/ipv4/nf_nat_masquerade.h>

#include <net/netfilter/nf_nat_masquerade.h>



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");

net/ipv6/netfilter/ip6t_MASQUERADE.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <net/netfilter/nf_nat.h>

#include <net/addrconf.h>

#include <net/ipv6.h>

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

#include <net/netfilter/nf_nat_masquerade.h>



static unsigned int

masquerade_tg6(struct sk_buff *skb, const struct xt_action_param *par)

net/netfilter/nf_nat_masquerade.c

+1 −2
Original line number Diff line number Diff line
@@ -7,8 +7,7 @@ 
#include <linux/netfilter_ipv4.h>

#include <linux/netfilter_ipv6.h>



#include <net/netfilter/ipv4/nf_nat_masquerade.h>

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

#include <net/netfilter/nf_nat_masquerade.h>



static DEFINE_MUTEX(masq_mutex);

static unsigned int masq_refcnt4 __read_mostly;