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 78f3655adcb5
("ipv4: remove "proto" argument from udp_tunnel_dst_lookup()").

Suggested-by: Guillaume Nault <gnault@redhat.com>
Signed-off-by: Beniamino Galvani <b.galvani@gmail.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c
index 9a0a1a9f6cfeb0560b53ac96b036bc9cc2b84c0b..9eb5e11c09b45fa0adf2d5d27d3c5290092d4734 100644 (file)
--- a/drivers/net/bareudp.c
+++ b/drivers/net/bareudp.c
@@ -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);
 

diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h
index 1dac296d84490c52d7b7754fa2bc598b76561f40..583867643bd11c0a28212fe2d18b735a737eb0dd 100644 (file)
--- a/include/net/udp_tunnel.h
+++ b/include/net/udp_tunnel.h
@@ -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,

diff --git a/net/ipv6/ip6_udp_tunnel.c b/net/ipv6/ip6_udp_tunnel.c
index fc122abf6b75f8a4e4edff8e6c329dc0deb4327c..b9c906518ce2b53a4a714d8ee8a961d442cdc230 100644 (file)
--- a/net/ipv6/ip6_udp_tunnel.c
+++ b/net/ipv6/ip6_udp_tunnel.c
@@ -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;