aboutsummaryrefslogtreecommitdiff
path: root/net/ipv4/ip_tunnel.c
diff options
context:
space:
mode:
authorGravatar Nicolas Dichtel <nicolas.dichtel@6wind.com> 2013-09-02 15:34:54 +0200
committerGravatar David S. Miller <davem@davemloft.net> 2013-09-04 00:27:25 -0400
commit8b7ed2d91d6afb0b55ba75f94b66e51f70783a46 (patch)
tree7bd59ac4b18e8d98dc4a215d20024fdabae713bd /net/ipv4/ip_tunnel.c
parentbonding: drop read_lock in bond_compute_features (diff)
downloadlinux-8b7ed2d91d6afb0b55ba75f94b66e51f70783a46.tar.gz
linux-8b7ed2d91d6afb0b55ba75f94b66e51f70783a46.tar.bz2
linux-8b7ed2d91d6afb0b55ba75f94b66e51f70783a46.zip
iptunnels: remove net arg from iptunnel_xmit()
This argument is not used, let's remove it. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_tunnel.c')
-rw-r--r--net/ipv4/ip_tunnel.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 830de3f4e293..0a6cf0e69478 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -654,8 +654,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
}
}
- err = iptunnel_xmit(tunnel->net, rt, skb,
- fl4.saddr, fl4.daddr, protocol,
+ err = iptunnel_xmit(rt, skb, fl4.saddr, fl4.daddr, protocol,
ip_tunnel_ecn_encap(tos, inner_iph, skb), ttl, df);
iptunnel_xmit_stats(err, &dev->stats, dev->tstats);