net: Merge dst_output and dst_output_sk

Add a sock paramter to dst_output making dst_output_sk superfluous.
Add a skb->sk parameter to all of the callers of dst_output
Have the callers of dst_output_sk call dst_output.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
index 928a0fb0b744..8178f72fe90d 100644
--- a/net/ipv6/output_core.c
+++ b/net/ipv6/output_core.c
@@ -149,7 +149,7 @@ static int __ip6_local_out_sk(struct sock *sk, struct sk_buff *skb)
         IP6CB(skb)->nhoff = offsetof(struct ipv6hdr, nexthdr);
 
         return nf_hook(NFPROTO_IPV6, NF_INET_LOCAL_OUT, sk, skb,
-                       NULL, skb_dst(skb)->dev, dst_output_sk);
+                       NULL, skb_dst(skb)->dev, dst_output);
 }
 
 int __ip6_local_out(struct sk_buff *skb)
@@ -164,7 +164,7 @@ int ip6_local_out_sk(struct sock *sk, struct sk_buff *skb)
 
         err = __ip6_local_out_sk(sk, skb);
         if (likely(err == 1))
-                err = dst_output_sk(sk, skb);
+                err = dst_output(sk, skb);
 
         return err;
 }