ipv4, ipv6: Pass net into ip_local_out and ip6_local_out

[deliverable/linux.git] / include / net / ip.h

diff --git a/include/net/ip.h b/include/net/ip.h
index dd06ab3669f9d4d38ea1e7cb8e0053516943566c..7febbab784cdfa4635fd4cf499ce78d78934db22 100644 (file)
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -112,12 +112,8 @@ int ip_mc_output(struct sock *sk, struct sk_buff *skb);
 int ip_do_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,
                   int (*output)(struct net *, struct sock *, struct sk_buff *));
 void ip_send_check(struct iphdr *ip);
-int __ip_local_out(struct sk_buff *skb);
-int ip_local_out_sk(struct sock *sk, struct sk_buff *skb);
-static inline int ip_local_out(struct sk_buff *skb)
-{
-       return ip_local_out_sk(skb->sk, skb);
-}
+int __ip_local_out(struct net *net, struct sock *sk, struct sk_buff *skb);
+int ip_local_out(struct net *net, struct sock *sk, struct sk_buff *skb);
 
 int ip_queue_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl);
 void ip_init(void);