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

netfilter: ipv4: remove useless export_symbol 



Only one caller; place it where needed and get rid of the EXPORT_SYMBOL.

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

include/linux/netfilter_ipv4.h

+0 −6
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook, 
		       unsigned int dataoff, u_int8_t protocol);

int nf_ip_route(struct net *net, struct dst_entry **dst, struct flowi *fl,

		bool strict);

int nf_ip_reroute(struct sk_buff *skb, const struct nf_queue_entry *entry);

#else

static inline __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,

				     unsigned int dataoff, u_int8_t protocol)
@@ -37,11 +36,6 @@ static inline int nf_ip_route(struct net *net, struct dst_entry **dst, 
{

	return -EOPNOTSUPP;

}

static inline int nf_ip_reroute(struct sk_buff *skb,

				const struct nf_queue_entry *entry)

{

	return -EOPNOTSUPP;

}

#endif /* CONFIG_INET */



#endif /*__LINUX_IP_NETFILTER_H*/

net/ipv4/netfilter.c

+0 −18
Original line number Diff line number Diff line
@@ -80,24 +80,6 @@ int ip_route_me_harder(struct net *net, struct sk_buff *skb, unsigned int addr_t 
}

EXPORT_SYMBOL(ip_route_me_harder);



int nf_ip_reroute(struct sk_buff *skb, const struct nf_queue_entry *entry)

{

	const struct ip_rt_info *rt_info = nf_queue_entry_reroute(entry);



	if (entry->state.hook == NF_INET_LOCAL_OUT) {

		const struct iphdr *iph = ip_hdr(skb);



		if (!(iph->tos == rt_info->tos &&

		      skb->mark == rt_info->mark &&

		      iph->daddr == rt_info->daddr &&

		      iph->saddr == rt_info->saddr))

			return ip_route_me_harder(entry->state.net, skb,

						  RTN_UNSPEC);

	}

	return 0;

}

EXPORT_SYMBOL_GPL(nf_ip_reroute);



int nf_ip_route(struct net *net, struct dst_entry **dst, struct flowi *fl,

		bool strict __always_unused)

{

net/netfilter/utils.c

+19 −0
Original line number Diff line number Diff line
@@ -180,6 +180,25 @@ int nf_route(struct net *net, struct dst_entry **dst, struct flowi *fl, 
}

EXPORT_SYMBOL_GPL(nf_route);



static int nf_ip_reroute(struct sk_buff *skb, const struct nf_queue_entry *entry)

{

#ifdef CONFIG_INET

	const struct ip_rt_info *rt_info = nf_queue_entry_reroute(entry);



	if (entry->state.hook == NF_INET_LOCAL_OUT) {

		const struct iphdr *iph = ip_hdr(skb);



		if (!(iph->tos == rt_info->tos &&

		      skb->mark == rt_info->mark &&

		      iph->daddr == rt_info->daddr &&

		      iph->saddr == rt_info->saddr))

			return ip_route_me_harder(entry->state.net, skb,

						  RTN_UNSPEC);

	}

#endif

	return 0;

}



int nf_reroute(struct sk_buff *skb, struct nf_queue_entry *entry)

{

	const struct nf_ipv6_ops *v6ops;