Commit 9f8955cc authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

ipv6: Merge __ip6_local_out and __ip6_local_out_sk 



Only __ip6_local_out_sk has callers so rename __ip6_local_out_sk
__ip6_local_out and remove the previous __ip6_local_out.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e2cb77db

include/net/ipv6.h

+1 −2
Original line number Diff line number Diff line
@@ -865,8 +865,7 @@ int ip6_forward(struct sk_buff *skb); 
int ip6_input(struct sk_buff *skb);

int ip6_mc_input(struct sk_buff *skb);



int __ip6_local_out_sk(struct sock *sk, struct sk_buff *skb);

int __ip6_local_out(struct sk_buff *skb);

int __ip6_local_out(struct sock *sk, struct sk_buff *skb);

int ip6_local_out_sk(struct sock *sk, struct sk_buff *skb);

int ip6_local_out(struct sk_buff *skb);

net/ipv6/output_core.c

+2 −7
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ int ip6_dst_hoplimit(struct dst_entry *dst) 
EXPORT_SYMBOL(ip6_dst_hoplimit);

#endif



int __ip6_local_out_sk(struct sock *sk, struct sk_buff *skb)

int __ip6_local_out(struct sock *sk, struct sk_buff *skb)

{

	struct net *net = dev_net(skb_dst(skb)->dev);

	int len;
@@ -153,11 +153,6 @@ int __ip6_local_out_sk(struct sock *sk, struct sk_buff *skb) 
		       net, sk, skb, NULL, skb_dst(skb)->dev,

		       dst_output);

}



int __ip6_local_out(struct sk_buff *skb)

{

	return __ip6_local_out_sk(skb->sk, skb);

}

EXPORT_SYMBOL_GPL(__ip6_local_out);



int ip6_local_out_sk(struct sock *sk, struct sk_buff *skb)
@@ -165,7 +160,7 @@ int ip6_local_out_sk(struct sock *sk, struct sk_buff *skb) 
	struct net *net = dev_net(skb_dst(skb)->dev);

	int err;



	err = __ip6_local_out_sk(sk, skb);

	err = __ip6_local_out(sk, skb);

	if (likely(err == 1))

		err = dst_output(net, sk, skb);

net/ipv6/route.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static struct dst_ops ip6_dst_ops_template = { 
	.link_failure		=	ip6_link_failure,

	.update_pmtu		=	ip6_rt_update_pmtu,

	.redirect		=	rt6_do_redirect,

	.local_out		=	__ip6_local_out_sk,

	.local_out		=	__ip6_local_out,

	.neigh_lookup		=	ip6_neigh_lookup,

};

net/ipv6/xfrm6_policy.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static struct dst_ops xfrm6_dst_ops = { 
	.cow_metrics =		dst_cow_metrics_generic,

	.destroy =		xfrm6_dst_destroy,

	.ifdown =		xfrm6_dst_ifdown,

	.local_out =		__ip6_local_out_sk,

	.local_out =		__ip6_local_out,

	.gc_thresh =		32768,

};