diff options
| author |   Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2013-09-02 15:34:54 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-09-04 00:27:25 -0400 |
| commit | 8b7ed2d91d6afb0b55ba75f94b66e51f70783a46 (patch) | |
| tree | 7bd59ac4b18e8d98dc4a215d20024fdabae713bd /net/ipv6/sit.c | |
| parent | bonding: drop read_lock in bond_compute_features (diff) | |
| download | linux-dev-8b7ed2d91d6afb0b55ba75f94b66e51f70783a46.tar.xz linux-dev-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/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index f18f842ac893..1d1458a3b7c4 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -888,8 +888,8 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, ttl = iph6->hop_limit; tos = INET_ECN_encapsulate(tos, ipv6_get_dsfield(iph6)); - err = iptunnel_xmit(dev_net(dev), rt, skb, fl4.saddr, fl4.daddr, - IPPROTO_IPV6, tos, ttl, df); + err = iptunnel_xmit(rt, skb, fl4.saddr, fl4.daddr, IPPROTO_IPV6, tos, + ttl, df); iptunnel_xmit_stats(err, &dev->stats, dev->tstats); return NETDEV_TX_OK; |