From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B926D3A2576; Sat, 12 Sep 2026 20:04:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789243441; cv=none; b=TC4mvDXI7fLTqVHva1Oxs6ZJUjtXFRIPLivA6Q/GWDCFUZq64YS4ZSLz9M7/VYbT/D3u9BZ2b9Dp7FFZpJX2PJIr2aBcil4VWrRnzFYkaLELWAjFyQRzWjbfekfv/UqTQdtKGf+j6po6NrQIP9V5wizTqQ1g/FU/AjMwl9zLVjU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789243441; c=relaxed/simple; bh=CueuJ+Q0sqg6m3k/BoUJVrIv/VvKJa51qvK08Qdccrk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aP43QYLCpBLM3ON5fgprOEF0kRAJyL5anehd0fdReyyGSSOC3EZy42AvRPkij0vlGiw0K1IAmuIwboWg78gThAxMblnhO1g7jAj73airuAwOrr4H3DraME6rh74d31P6MTxdvtK5LL+FpDQoZs3PvnW/zxhlv9YOgbYv7ZFs8es= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FpX4oPdv; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="FpX4oPdv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F2E21F000FF; Sat, 12 Sep 2026 20:03:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789243440; bh=uRnr64DdTSa+7ivMAxfM2lE11hXEs9ypdFvSovbxiyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FpX4oPdvXijJKPRlgQdKqfCoUxESNV1aDNlDyqABenkf8xTbftuYUT5EmrayHDsk7 vXtz6ZGDsxODCeyxiNzSpELVdVARJi9EhRBzjOFDFOTK5oopwkUmycFSBC5YZGUf0T 9C4luHTUttsJdiwlPcVH4gbdVIoCKgvV1Jw0Y3PM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Abaci Robot , Jiapeng Chong , Paolo Abeni , Sasha Levin Subject: [PATCH 5.10 757/798] net: ip6_gre: Remove the unused function ip6gre_tnl_addr_conflict() Date: Sat, 12 Sep 2026 09:06:25 +0200 Message-ID: <20260912065534.417810923@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065516.948645775@linuxfoundation.org> References: <20260912065516.948645775@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiapeng Chong [ Upstream commit f00909e2e6fe4ac6b2420e3863a0c533fe4f15e0 ] The function ip6gre_tnl_addr_conflict() is defined in the ip6_gre.c file, but not called elsewhere, so delete this unused function. net/ipv6/ip6_gre.c:887:20: warning: unused function 'ip6gre_tnl_addr_conflict'. Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=2419 Reported-by: Abaci Robot Signed-off-by: Jiapeng Chong Link: https://lore.kernel.org/r/20221017093540.26806-1-jiapeng.chong@linux.alibaba.com Signed-off-by: Paolo Abeni Stable-dep-of: 709f34f7c28d ("net/sched: fq: add overflow bounds to quantum and initial quantum") Signed-off-by: Sasha Levin --- net/ipv6/ip6_gre.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index f623d3949bc42..ff4a205ae73fe 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -851,26 +851,6 @@ static inline int ip6gre_xmit_ipv6(struct sk_buff *skb, struct net_device *dev) return 0; } -/** - * ip6gre_tnl_addr_conflict - compare packet addresses to tunnel's own - * @t: the outgoing tunnel device - * @hdr: IPv6 header from the incoming packet - * - * Description: - * Avoid trivial tunneling loop by checking that tunnel exit-point - * doesn't match source of incoming packet. - * - * Return: - * 1 if conflict, - * 0 else - **/ - -static inline bool ip6gre_tnl_addr_conflict(const struct ip6_tnl *t, - const struct ipv6hdr *hdr) -{ - return ipv6_addr_equal(&t->parms.raddr, &hdr->saddr); -} - static int ip6gre_xmit_other(struct sk_buff *skb, struct net_device *dev) { struct ip6_tnl *t = netdev_priv(dev); -- 2.53.0