Commit 6a7d88ca authored by Petr Machata's avatar Petr Machata Committed by Jakub Kicinski
Browse files

net: ipv6: Make udp_tunnel6_xmit_skb() void 



The function always returns zero, thus the return value does not carry any
signal. Just make it void.

Most callers already ignore the return value. However:

- Refold arguments of the call from sctp_v6_xmit() so that they fit into
  the 80-column limit.

- tipc_udp_xmit() initializes err from the return value, but that should
  already be always zero at that point. So there's no practical change, but
  elision of the assignment prompts a couple more tweaks to clean up the
  function.

Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Link: https://patch.msgid.link/7facacf9d8ca3ca9391a4aee88160913671b868d.1750113335.git.petrm@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 35bec72a

include/net/udp_tunnel.h

+7 −7
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ void udp_tunnel_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *skb 
			 __be16 df, __be16 src_port, __be16 dst_port,

			 bool xnet, bool nocheck, u16 ipcb_flags);



int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk,

void udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk,

			  struct sk_buff *skb,

			  struct net_device *dev,

			  const struct in6_addr *saddr,

net/ipv6/ip6_udp_tunnel.c

+7 −8
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg, 
}

EXPORT_SYMBOL_GPL(udp_sock_create6);



int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk,

void udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk,

			  struct sk_buff *skb,

			  struct net_device *dev,

			  const struct in6_addr *saddr,
@@ -109,7 +109,6 @@ int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk, 
	ip6h->saddr	  = *saddr;



	ip6tunnel_xmit(sk, skb, dev);

	return 0;

}

EXPORT_SYMBOL_GPL(udp_tunnel6_xmit_skb);

net/sctp/ipv6.c

+4 −3
Original line number Diff line number Diff line
@@ -261,9 +261,10 @@ static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *t) 
	skb_set_inner_ipproto(skb, IPPROTO_SCTP);

	label = ip6_make_flowlabel(sock_net(sk), skb, fl6->flowlabel, true, fl6);



	return udp_tunnel6_xmit_skb(dst, sk, skb, NULL, &fl6->saddr,

				    &fl6->daddr, tclass, ip6_dst_hoplimit(dst),

				    label, sctp_sk(sk)->udp_port, t->encap_port, false);

	udp_tunnel6_xmit_skb(dst, sk, skb, NULL, &fl6->saddr, &fl6->daddr,

			     tclass, ip6_dst_hoplimit(dst), label,

			     sctp_sk(sk)->udp_port, t->encap_port, false);

	return 0;

}



/* Returns the dst cache entry for the given source and destination ip

net/tipc/udp_media.c

+5 −5
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int tipc_udp_xmit(struct net *net, struct sk_buff *skb, 
			 struct udp_media_addr *dst, struct dst_cache *cache)

{

	struct dst_entry *ndst;

	int ttl, err = 0;

	int ttl, err;



	local_bh_disable();

	ndst = dst_cache_get(cache);
@@ -217,13 +217,13 @@ static int tipc_udp_xmit(struct net *net, struct sk_buff *skb, 
			dst_cache_set_ip6(cache, ndst, &fl6.saddr);

		}

		ttl = ip6_dst_hoplimit(ndst);

		err = udp_tunnel6_xmit_skb(ndst, ub->ubsock->sk, skb, NULL,

		udp_tunnel6_xmit_skb(ndst, ub->ubsock->sk, skb, NULL,

				     &src->ipv6, &dst->ipv6, 0, ttl, 0,

				     src->port, dst->port, false);

#endif

	}

	local_bh_enable();

	return err;

	return 0;



tx_error:

	local_bh_enable();