diff options
| author | Florian Westphal | 2019-04-09 10:44:06 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2019-04-11 20:59:21 +0200 |
| commit | bf8981a2aa082d9d64771b47c8a1c9c388d8cd40 (patch) | |
| tree | 2fc443bf49240b24160cd1fe244bc8ebefc91623 /include/net | |
| parent | netfilter: make two functions static (diff) | |
| download | kernel-qcow2-linux-bf8981a2aa082d9d64771b47c8a1c9c388d8cd40.tar.gz kernel-qcow2-linux-bf8981a2aa082d9d64771b47c8a1c9c388d8cd40.tar.xz kernel-qcow2-linux-bf8981a2aa082d9d64771b47c8a1c9c388d8cd40.zip | |
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: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netfilter/ipv6/nf_nat_masquerade.h | 11 | ||||
| -rw-r--r-- | include/net/netfilter/nf_nat_masquerade.h (renamed from include/net/netfilter/ipv4/nf_nat_masquerade.h) | 12 |
2 files changed, 9 insertions, 14 deletions
diff --git a/include/net/netfilter/ipv6/nf_nat_masquerade.h b/include/net/netfilter/ipv6/nf_nat_masquerade.h deleted file mode 100644 index 2917bf95c437..000000000000 --- a/include/net/netfilter/ipv6/nf_nat_masquerade.h +++ /dev/null @@ -1,11 +0,0 @@ -/* 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_ */ diff --git a/include/net/netfilter/ipv4/nf_nat_masquerade.h b/include/net/netfilter/nf_nat_masquerade.h index 13d55206bb9f..cafe71822a53 100644 --- a/include/net/netfilter/ipv4/nf_nat_masquerade.h +++ b/include/net/netfilter/nf_nat_masquerade.h @@ -1,6 +1,6 @@ /* 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_ */ |