Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b7ed2d9 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

iptunnels: remove net arg from iptunnel_xmit() 



This argument is not used, let's remove it.

Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c4826861

drivers/net/vxlan.c

+1 −2
Original line number Diff line number Diff line
@@ -1528,8 +1528,7 @@ int vxlan_xmit_skb(struct net *net, struct vxlan_sock *vs, 
	if (err)

		return err;



	return iptunnel_xmit(net, rt, skb, src, dst,

			IPPROTO_UDP, tos, ttl, df);

	return iptunnel_xmit(rt, skb, src, dst, IPPROTO_UDP, tos, ttl, df);

}

EXPORT_SYMBOL_GPL(vxlan_xmit_skb);

include/net/ip_tunnels.h

+1 −2
Original line number Diff line number Diff line
@@ -146,8 +146,7 @@ static inline u8 ip_tunnel_ecn_encap(u8 tos, const struct iphdr *iph, 
}



int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto);

int iptunnel_xmit(struct net *net, struct rtable *rt,

		  struct sk_buff *skb,

int iptunnel_xmit(struct rtable *rt, struct sk_buff *skb,

		  __be32 src, __be32 dst, __u8 proto,

		  __u8 tos, __u8 ttl, __be16 df);

net/ipv4/ip_tunnel.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

net/ipv4/ip_tunnel_core.c

+1 −2
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ 
#include <net/netns/generic.h>

#include <net/rtnetlink.h>



int iptunnel_xmit(struct net *net, struct rtable *rt,

		  struct sk_buff *skb,

int iptunnel_xmit(struct rtable *rt, struct sk_buff *skb,

		  __be32 src, __be32 dst, __u8 proto,

		  __u8 tos, __u8 ttl, __be16 df)

{

net/ipv6/sit.c

+2 −2
Original line number Diff line number Diff line
@@ -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;