diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-10-07 16:48:45 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-08 04:27:02 -0700 |
| commit | cf91a99daa4651d0c1f52b8c3d813fd44b43cada (patch) | |
| tree | 211da00c404e813c85c8574cf09e91b2003e8202 /net/ipv4/ip_output.c | |
| parent | 57c4bf859cad9d6c4f73d8c98a95e00f156301e0 (diff) | |
| download | linux-stable-cf91a99daa4651d0c1f52b8c3d813fd44b43cada.tar.gz linux-stable-cf91a99daa4651d0c1f52b8c3d813fd44b43cada.tar.bz2 linux-stable-cf91a99daa4651d0c1f52b8c3d813fd44b43cada.zip | |
ipv4, ipv6: Pass net into __ip_local_out and __ip6_local_out
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_output.c')
| -rw-r--r-- | net/ipv4/ip_output.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index a7012f2fa68a..39d3fbe66c68 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -96,9 +96,8 @@ void ip_send_check(struct iphdr *iph) } EXPORT_SYMBOL(ip_send_check); -int __ip_local_out(struct sock *sk, struct sk_buff *skb) +int __ip_local_out(struct net *net, struct sock *sk, struct sk_buff *skb) { - struct net *net = dev_net(skb_dst(skb)->dev); struct iphdr *iph = ip_hdr(skb); iph->tot_len = htons(skb->len); @@ -113,7 +112,7 @@ int ip_local_out(struct sock *sk, struct sk_buff *skb) struct net *net = dev_net(skb_dst(skb)->dev); int err; - err = __ip_local_out(sk, skb); + err = __ip_local_out(net, sk, skb); if (likely(err == 1)) err = dst_output(net, sk, skb); |