Skip to contentSkip to conversation

netfilter: only compile nf_nat_ipv4_nlattr_to_range/nf_nat_ipv6_nlattr_to_range

PATCH New Duan Jiong 1 participant 1 message Jun 27, 2014

Subsystems (2)
Networking netfilter
lore
Share & tools
lore

Duan Jiong

author
#0 lore raw

PATCH 1/1 netfilter: only compile nf_nat_ipv4_nlattr_to_range/nf_nat_ipv6_nlattr_to_range

When CONFIG_NF_CT_NETLINK is configed.

Signed-off-by Duan Jiong <[email protected]>
---
 net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 4 ++++
 net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 4 ++++
 2 files changed, 8 insertions(+)
net/ipv4/netfilter/nf_nat_l3proto_ipv4.c +4 -0
index d8b2e14..14f5ccd 100644
@@ -154,6 +154,7 @@ static void nf_nat_ipv4_csum_recalc(struct sk_buff *skb,
 					 htons(oldlen), htons(datalen), 1);
 }
 
+#if IS_ENABLED(CONFIG_NF_CT_NETLINK)
 static int nf_nat_ipv4_nlattr_to_range(struct nlattr *tb[],
 				       struct nf_nat_range *range)
 {

@@ -169,6 +170,7 @@ static int nf_nat_ipv4_nlattr_to_range(struct nlattr *tb[],
 
 	return 0;
 }
+#endif
 
 static const struct nf_nat_l3proto nf_nat_l3proto_ipv4 = {
 	.l3proto		= NFPROTO_IPV4,

@@ -177,7 +179,9 @@ static const struct nf_nat_l3proto nf_nat_l3proto_ipv4 = {
 	.manip_pkt		= nf_nat_ipv4_manip_pkt,
 	.csum_update		= nf_nat_ipv4_csum_update,
 	.csum_recalc		= nf_nat_ipv4_csum_recalc,
+#if IS_ENABLED(CONFIG_NF_CT_NETLINK)
 	.nlattr_to_range	= nf_nat_ipv4_nlattr_to_range,
+#endif
 #ifdef CONFIG_XFRM
 	.decode_session		= nf_nat_ipv4_decode_session,
 #endif
net/ipv6/netfilter/nf_nat_l3proto_ipv6.c +4 -0
index abfe75a..fc8e49b 100644
@@ -158,6 +158,7 @@ static void nf_nat_ipv6_csum_recalc(struct sk_buff *skb,
 					 htons(oldlen), htons(datalen), 1);
 }
 
+#if IS_ENABLED(CONFIG_NF_CT_NETLINK)
 static int nf_nat_ipv6_nlattr_to_range(struct nlattr *tb[],
 				       struct nf_nat_range *range)
 {

@@ -175,6 +176,7 @@ static int nf_nat_ipv6_nlattr_to_range(struct nlattr *tb[],
 
 	return 0;
 }
+#endif
 
 static const struct nf_nat_l3proto nf_nat_l3proto_ipv6 = {
 	.l3proto		= NFPROTO_IPV6,

@@ -183,7 +185,9 @@ static const struct nf_nat_l3proto nf_nat_l3proto_ipv6 = {
 	.manip_pkt		= nf_nat_ipv6_manip_pkt,
 	.csum_update		= nf_nat_ipv6_csum_update,
 	.csum_recalc		= nf_nat_ipv6_csum_recalc,
+#if IS_ENABLED(CONFIG_NF_CT_NETLINK)
 	.nlattr_to_range	= nf_nat_ipv6_nlattr_to_range,
+#endif
 #ifdef CONFIG_XFRM
 	.decode_session	= nf_nat_ipv6_decode_session,
 #endif
Signature · 1 line
1.8.3.1