From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3F7CB37DAB3 for ; Thu, 25 Jun 2026 08:25:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782375916; cv=none; b=sCZcLfopFQANieN4qH4TqO0R6jrR3exOBE2fky5NzBpq5svYdW6NeGVm5CljdcZImxjbeNqHn8SgQTxlVYKf0WVNX8AXY/7ptPpbE5WN/YEPjDB2gljE4NaUb4msqiA6g2ELwu6QyDkcsfwNK6fnze9gpK2HAM8nFy1lzHJ0fso= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782375916; c=relaxed/simple; bh=FttxWcQB/hNn+4s9v0hsj+DpOXG7C6zn1XazAFM7dH4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FJ/0fADEaePSzM0q7tI3XSpSGzPPgvl4SfIoLUvc7QCdJ+rIFPyAfXjD6ZjutoNvPvOSEPNUUZ+o3fsGudi2MT/iOVePFf7VSzYTftavTVqKFiTlleegs28aIJ3PftiirQ84ilEdI689W+Ixxl+C50aoEoqh+c6mNozrljlsHGg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lxfWE3wX; arc=none smtp.client-ip=209.85.167.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lxfWE3wX" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-5aa2c25c632so2022585e87.1 for ; Thu, 25 Jun 2026 01:25:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782375912; x=1782980712; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YNsZSX3/QBjqrDIvX4drEF9Odl8RtjkKP8nQ70A9iWI=; b=lxfWE3wXOPqeE/e51favXN6jlbuBkWkaWVrfdA1/4TTbjaGumbP2VPamidjALhrg5e caq/MgRnP7+INT4a4QVtS6zy8yF7n4qNB7yR4mpgATEMF2/pfN0bSPwhAF9V+cP8y9Ki aN1AcuTMN3mfUY3u6c2nY7gTQ3CSFziVJlaRrXoariu8wIIzyurG7Ny+qQ1TNOuhVt2z zmjq53KrcqIR7uqPBiKiLNRxxSG09MLt8JNpcxOecYErnmsSwFtMMlcWZ6dquyraQ5UI bqdrEGsl0985UBaYUSIg3DtoRbIdd7Zj7Qe4BtBjzKtO+9AD1X3vyCK+EiykwvwZ6bM7 2Zlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782375912; x=1782980712; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YNsZSX3/QBjqrDIvX4drEF9Odl8RtjkKP8nQ70A9iWI=; b=d5+GPJnNMK4vBTgERHCGYijvfX+h+laZtnW8Z/Rkz3+Nje5EK2EGVw8LFbtIF+vkMX 0Td5igLzmA/ln3przgSK/tqwJYb3STfkZOKxrBoAk23wWeA387EpWEy8SAVfoIgrkYTL fZ2jADP0yo7RONAGYE1x5VuB66/znH1imZdaj1rJA14oMYUmCsm2xebKs7+Y8ismGEIT C+svlky96n+eI0CgZU4XN9EaYmNL0BbLz7jRdy2TybBNxSJEdwnQmDJK1xSOVHDQqVLk O3UFKeru3kusmnEf3rUTyJaouPcJF0GrwrgH19qqODsdal0HbwEctA2rehcbxvgRbmfP bzjw== X-Forwarded-Encrypted: i=1; AHgh+RqcgiI013t24MQeG3Khjgcct32DZwT2IMlG0ENAgKELDs8a92hW1JKNasdpIAjpm9pLdo16e3gC8KesFgw=@vger.kernel.org X-Gm-Message-State: AOJu0Yx2rWVbT18vYavRORfHnyFzMF7W3rFvftPFEfuSAfuIgxfxsr/i POo9qOTej/Ntcgn8IMsVS2uOPIlrrpnX0nKQkS6Bv4s1a9tMOSnafqjb X-Gm-Gg: AfdE7clvyrx+XsiLY2cIJ4SuIvbuOB8navbFnECdzP7xNpZ+0qb/etsi+QD/C9Fs3Bg m9VCFq53AcZQVtwsC9DKmbKqZ05T1N4ljslMqysetX865tdQlh0m83wpdOzrp31iEMvn8l5l7ji 3WDYOinYrKPKCv/+7jzPb9yVDhRPN8XhmFiF7C4ZbI78c5Kpd6sNWfMdtpYxGgjOHYNHfKSuA1d 6Tc5ioBWaq9l6pafh595wkTs3lE1por9RWtgi1oPP4dGvTZprSeQuLQwH9OjLUkQuPLGn/CVtcj KcyG51u6scY+bb7qBoSo2TpE1dN/zv/owMwVJIK964BqdwXHDr5uSFNM/XUmoQ3WJPayfsDjcjb +0Mfw2Kp14QqdhYsUDvfdyC7aQ4ZM49kNpc9Ny0WgiQwiBl556p9f3zxlSfjFxDTmFuTWzQLw3S BadXK9OsyKeK1qqAiuyCH+KZLeOXGz X-Received: by 2002:a05:6512:b8b:b0:5aa:6df7:4eac with SMTP id 2adb3069b0e04-5aea1f2d8famr531570e87.20.1782375912271; Thu, 25 Jun 2026 01:25:12 -0700 (PDT) Received: from grower.astra-academy.ru ([185.32.135.49]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-39ad31a81adsm566391fa.28.2026.06.25.01.25.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2026 01:25:11 -0700 (PDT) From: Alexander Martyniuk To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: Alexander Martyniuk , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern , Marcelo Ricardo Leitner , Xin Long , Jon Maloy , Ying Xue , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sctp@vger.kernel.org, tipc-discussion@lists.sourceforge.net, Petr Machata , Ido Schimmel , Nikolay Aleksandrov Subject: [PATCH 6.12 1/2] net: ipv6: Make udp_tunnel6_xmit_skb() void Date: Thu, 25 Jun 2026 11:24:41 +0300 Message-ID: <20260625082442.96390-2-alexevgmart@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260625082442.96390-1-alexevgmart@gmail.com> References: <20260625082442.96390-1-alexevgmart@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Petr Machata commit 6a7d88ca15f73c5c570c372238f71d63da1fda55 upstream. 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: Petr Machata Reviewed-by: Ido Schimmel Reviewed-by: Nikolay Aleksandrov Link: https://patch.msgid.link/7facacf9d8ca3ca9391a4aee88160913671b868d.1750113335.git.petrm@nvidia.com Signed-off-by: Jakub Kicinski Signed-off-by: Alexander Martyniuk --- include/net/udp_tunnel.h | 14 +++++++------- net/ipv6/ip6_udp_tunnel.c | 15 +++++++-------- net/sctp/ipv6.c | 7 ++++--- net/tipc/udp_media.c | 10 +++++----- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h index 6e2c5c77031f..8ed36ec520d7 100644 --- a/include/net/udp_tunnel.h +++ b/include/net/udp_tunnel.h @@ -152,13 +152,13 @@ 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); -int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk, - struct sk_buff *skb, - struct net_device *dev, - const struct in6_addr *saddr, - const struct in6_addr *daddr, - __u8 prio, __u8 ttl, __be32 label, - __be16 src_port, __be16 dst_port, bool nocheck); +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, + const struct in6_addr *daddr, + __u8 prio, __u8 ttl, __be32 label, + __be16 src_port, __be16 dst_port, bool nocheck); void udp_tunnel_sock_release(struct socket *sock); diff --git a/net/ipv6/ip6_udp_tunnel.c b/net/ipv6/ip6_udp_tunnel.c index 2acf1bb93fc0..f22eff2ba77c 100644 --- a/net/ipv6/ip6_udp_tunnel.c +++ b/net/ipv6/ip6_udp_tunnel.c @@ -74,13 +74,13 @@ 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, - struct sk_buff *skb, - struct net_device *dev, - const struct in6_addr *saddr, - const struct in6_addr *daddr, - __u8 prio, __u8 ttl, __be32 label, - __be16 src_port, __be16 dst_port, bool nocheck) +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, + const struct in6_addr *daddr, + __u8 prio, __u8 ttl, __be32 label, + __be16 src_port, __be16 dst_port, bool nocheck) { struct udphdr *uh; struct ipv6hdr *ip6h; @@ -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); diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index 9f835e674c59..b4c321bad033 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c @@ -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 diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c index 258d6aa4f21a..1b8d6bbf8a8e 100644 --- a/net/tipc/udp_media.c +++ b/net/tipc/udp_media.c @@ -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, - &src->ipv6, &dst->ipv6, 0, ttl, 0, - src->port, dst->port, false); + 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(); -- 2.43.0