|
@@ -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);
|
|
|
|