Commit 7e937dcf authored by Beniamino Galvani's avatar Beniamino Galvani Committed by David S. Miller
Browse files

ipv6: remove "proto" argument from udp_tunnel6_dst_lookup() 



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

This is similar to what already done for IPv4 in commit 78f3655a
("ipv4: remove "proto" argument from udp_tunnel_dst_lookup()").

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 fc47e86d

drivers/net/bareudp.c

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



	dst = udp_tunnel6_dst_lookup(skb, dev, bareudp->net, sock, &saddr, info,

				     IPPROTO_UDP, use_cache);

				     use_cache);

	if (IS_ERR(dst))

		return PTR_ERR(dst);
@@ -499,8 +499,7 @@ static int bareudp_fill_metadata_dst(struct net_device *dev, 
		struct socket *sock = rcu_dereference(bareudp->sock);



		dst = udp_tunnel6_dst_lookup(skb, dev, bareudp->net, sock,

					     &saddr, info, IPPROTO_UDP,

					     use_cache);

					     &saddr, info, use_cache);

		if (IS_ERR(dst))

			return PTR_ERR(dst);

include/net/udp_tunnel.h

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ struct dst_entry *udp_tunnel6_dst_lookup(struct sk_buff *skb, 
					 struct socket *sock,

					 struct in6_addr *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/ipv6/ip6_udp_tunnel.c

+1 −3
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ EXPORT_SYMBOL_GPL(udp_tunnel6_xmit_skb); 
 *      @sock: Socket which provides route info

 *      @saddr: Memory to store the src ip address

 *      @info: Tunnel information

 *      @protocol: IP protocol

 *      @use_cache: Flag to enable cache usage

 *      This function performs a route lookup on a UDP tunnel

 *
@@ -135,7 +134,6 @@ struct dst_entry *udp_tunnel6_dst_lookup(struct sk_buff *skb, 
					 struct socket *sock,

					 struct in6_addr *saddr,

					 const struct ip_tunnel_info *info,

					 u8 protocol,

					 bool use_cache)

{

	struct dst_entry *dst = NULL;
@@ -155,7 +153,7 @@ struct dst_entry *udp_tunnel6_dst_lookup(struct sk_buff *skb, 
#endif

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

	fl6.flowi6_mark = skb->mark;

	fl6.flowi6_proto = protocol;

	fl6.flowi6_proto = IPPROTO_UDP;

	fl6.daddr = info->key.u.ipv6.dst;

	fl6.saddr = info->key.u.ipv6.src;

	prio = info->key.tos;