iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv4: remove "proto" argument from udp_tunnel_dst_lookup()

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

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>
This commit is contained in:
Beniamino Galvani 2023-10-16 09:15:21 +02:00 committed by David S. Miller
parent bf3fcbf7e7
commit 78f3655adc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/bareudp.c
View File

@ -307,7 +307,7 @@ static int bareudp_xmit_skb(struct sk_buff *skb, struct net_device *dev,
return -ESHUTDOWN; return -ESHUTDOWN;
rt = udp_tunnel_dst_lookup(skb, dev, bareudp->net, &saddr, info, rt = udp_tunnel_dst_lookup(skb, dev, bareudp->net, &saddr, info,
IPPROTO_UDP, use_cache); use_cache);
if (IS_ERR(rt)) if (IS_ERR(rt))
return PTR_ERR(rt); return PTR_ERR(rt);
@ -484,7 +484,7 @@ static int bareudp_fill_metadata_dst(struct net_device *dev,
__be32 saddr; __be32 saddr;
rt = udp_tunnel_dst_lookup(skb, dev, bareudp->net, &saddr, rt = udp_tunnel_dst_lookup(skb, dev, bareudp->net, &saddr,
info, IPPROTO_UDP, use_cache); info, use_cache);
if (IS_ERR(rt)) if (IS_ERR(rt))
return PTR_ERR(rt); return PTR_ERR(rt);

2
include/net/udp_tunnel.h
View File

@ -166,7 +166,7 @@ struct rtable *udp_tunnel_dst_lookup(struct sk_buff *skb,
struct net_device *dev, struct net_device *dev,
struct net *net, __be32 *saddr, struct net *net, __be32 *saddr,
const struct ip_tunnel_info *info, 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, struct metadata_dst *udp_tun_rx_dst(struct sk_buff *skb, unsigned short family,
__be16 flags, __be64 tunnel_id, __be16 flags, __be64 tunnel_id,

4
net/ipv4/udp_tunnel_core.c
View File

@ -208,7 +208,7 @@ struct rtable *udp_tunnel_dst_lookup(struct sk_buff *skb,
struct net_device *dev, struct net_device *dev,
struct net *net, __be32 *saddr, struct net *net, __be32 *saddr,
const struct ip_tunnel_info *info, const struct ip_tunnel_info *info,
u8 protocol, bool use_cache) bool use_cache)
{ {
#ifdef CONFIG_DST_CACHE #ifdef CONFIG_DST_CACHE
struct dst_cache *dst_cache; struct dst_cache *dst_cache;
@ -227,7 +227,7 @@ struct rtable *udp_tunnel_dst_lookup(struct sk_buff *skb,
#endif #endif
memset(&fl4, 0, sizeof(fl4)); memset(&fl4, 0, sizeof(fl4));
fl4.flowi4_mark = skb->mark; fl4.flowi4_mark = skb->mark;
fl4.flowi4_proto = protocol; fl4.flowi4_proto = IPPROTO_UDP;
fl4.daddr = info->key.u.ipv4.dst; fl4.daddr = info->key.u.ipv4.dst;
fl4.saddr = info->key.u.ipv4.src; fl4.saddr = info->key.u.ipv4.src;
tos = info->key.tos; tos = info->key.tos;