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

Commit 43b8448c authored by Jarno Rajahalme's avatar Jarno Rajahalme Committed by David S. Miller
Browse files

udp_tunnel: Remove redundant udp_tunnel_gro_complete(). 



The setting of the UDP tunnel GSO type is already performed by
udp[46]_gro_complete().

Signed-off-by: default avatarJarno Rajahalme <jarno@ovn.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8e0ddc04

drivers/net/geneve.c

+0 −2
Original line number Diff line number Diff line
@@ -504,8 +504,6 @@ static int geneve_gro_complete(struct sk_buff *skb, int nhoff, 
	int gh_len;

	int err = -ENOSYS;



	udp_tunnel_gro_complete(skb, nhoff);



	gh = (struct genevehdr *)(skb->data + nhoff);

	gh_len = geneve_hlen(gh);

	type = gh->proto_type;

drivers/net/vxlan.c

+0 −2
Original line number Diff line number Diff line
@@ -616,8 +616,6 @@ static struct sk_buff **vxlan_gro_receive(struct sk_buff **head, 
static int vxlan_gro_complete(struct sk_buff *skb, int nhoff,

			      struct udp_offload *uoff)

{

	udp_tunnel_gro_complete(skb, nhoff);



	return eth_gro_complete(skb, nhoff + sizeof(struct vxlanhdr));

}

include/net/udp_tunnel.h

+0 −9
Original line number Diff line number Diff line
@@ -106,15 +106,6 @@ static inline struct sk_buff *udp_tunnel_handle_offloads(struct sk_buff *skb, 
	return iptunnel_handle_offloads(skb, type);

}



static inline void udp_tunnel_gro_complete(struct sk_buff *skb, int nhoff)

{

	struct udphdr *uh;



	uh = (struct udphdr *)(skb->data + nhoff - sizeof(struct udphdr));

	skb_shinfo(skb)->gso_type |= uh->check ?

				SKB_GSO_UDP_TUNNEL_CSUM : SKB_GSO_UDP_TUNNEL;

}



static inline void udp_tunnel_encap_enable(struct socket *sock)

{

#if IS_ENABLED(CONFIG_IPV6)

net/ipv4/fou.c

+0 −2
Original line number Diff line number Diff line
@@ -228,8 +228,6 @@ static int fou_gro_complete(struct sk_buff *skb, int nhoff, 
	int err = -ENOSYS;

	const struct net_offload **offloads;



	udp_tunnel_gro_complete(skb, nhoff);



	rcu_read_lock();

	offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads;

	ops = rcu_dereference(offloads[proto]);