summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_tunnel_core.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2015-10-07 16:48:46 -0500
committerDavid S. Miller <davem@davemloft.net>2015-10-08 04:27:02 -0700
commit33224b16ffccb49cf798317670389e0bfba0024c (patch)
tree25a11f38cf0da4331c558a06d4f3a5ccaabf12fa /net/ipv4/ip_tunnel_core.c
parentcf91a99daa4651d0c1f52b8c3d813fd44b43cada (diff)
downloadblackbird-obmc-linux-33224b16ffccb49cf798317670389e0bfba0024c.tar.gz
blackbird-obmc-linux-33224b16ffccb49cf798317670389e0bfba0024c.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_tunnel_core.c')
-rw-r--r--net/ipv4/ip_tunnel_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index caef8e2c281d..6cb9009c3d96 100644
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -79,7 +79,7 @@ int iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,
iph->ttl = ttl;
__ip_select_ident(net, iph, skb_shinfo(skb)->gso_segs ?: 1);
- err = ip_local_out(sk, skb);
+ err = ip_local_out(net, sk, skb);
if (unlikely(net_xmit_eval(err)))
pkt_len = 0;
return pkt_len;
OpenPOWER on IntegriCloud