Commit 78f3655a authored by Beniamino Galvani's avatar Beniamino Galvani Committed by David S. Miller
Browse files

ipv4: remove "proto" argument from udp_tunnel_dst_lookup() 



The function is now UDP-specific, the protocol is always IPPROTO_UDP.

Suggested-by: default avatarGuillaume Nault <gnault@redhat.com>
Signed-off-by: default avatarBeniamino Galvani <b.galvani@gmail.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bf3fcbf7

drivers/net/bareudp.c

+2 −2
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static int bareudp_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
		return -ESHUTDOWN;



	rt = udp_tunnel_dst_lookup(skb, dev, bareudp->net, &saddr, info,

				   IPPROTO_UDP, use_cache);

				   use_cache);



	if (IS_ERR(rt))

		return PTR_ERR(rt);
@@ -484,7 +484,7 @@ static int bareudp_fill_metadata_dst(struct net_device *dev, 
		__be32 saddr;



		rt = udp_tunnel_dst_lookup(skb, dev, bareudp->net, &saddr,

					   info, IPPROTO_UDP, use_cache);

					   info, use_cache);

		if (IS_ERR(rt))

			return PTR_ERR(rt);

include/net/udp_tunnel.h

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ struct rtable *udp_tunnel_dst_lookup(struct sk_buff *skb, 
				     struct net_device *dev,

				     struct net *net, __be32 *saddr,

				     const struct ip_tunnel_info *info,

				     u8 protocol, bool use_cache);

				     bool use_cache);



struct metadata_dst *udp_tun_rx_dst(struct sk_buff *skb, unsigned short family,

				    __be16 flags, __be64 tunnel_id,

net/ipv4/udp_tunnel_core.c

+2 −2
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ struct rtable *udp_tunnel_dst_lookup(struct sk_buff *skb, 
				     struct net_device *dev,

				     struct net *net, __be32 *saddr,

				     const struct ip_tunnel_info *info,

				     u8 protocol, bool use_cache)

				     bool use_cache)

{

#ifdef CONFIG_DST_CACHE

	struct dst_cache *dst_cache;
@@ -227,7 +227,7 @@ struct rtable *udp_tunnel_dst_lookup(struct sk_buff *skb, 
#endif

	memset(&fl4, 0, sizeof(fl4));

	fl4.flowi4_mark = skb->mark;

	fl4.flowi4_proto = protocol;

	fl4.flowi4_proto = IPPROTO_UDP;

	fl4.daddr = info->key.u.ipv4.dst;

	fl4.saddr = info->key.u.ipv4.src;

	tos = info->key.tos;