From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 08BE5127B70; Tue, 30 Apr 2024 10:42:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714473723; cv=none; b=AogHp6vCPzVrOnI+zPvQJshSMBy2zRQGeFImQa8QXV/WRTxZqnV8ByKs18ifqTrrnqXlwkUe2BCvC4ZCGqa9eb8ScoMitQAxoikV68rTWIPuj5PGUjampZaodjd9GSwKQgVsoC08V6EAyi6WIJrr6OSDRQ2BJ5B/zssqTdvlCZQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714473723; c=relaxed/simple; bh=WPOt4jvOjGtGbyrLuU2d1F2V1ai0lr6lWF33pL4trKo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iDw5UY1fVmFUsLF+5+aSg4rZNCAzKMy81ep0o9euTUXaFvIGJx7E0Jo5xdSqEQadl4mgHBYKjnsk2GkSt3fynctW+QPg4kRu4tvAPiv46Lb/77nKXxqpJp1/jBTaLAeOK+JMyLW3pbH6bi+lT8y35TBkvZd0L0abtNkaOrRUBsc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JRaqBN49; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="JRaqBN49" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C281C2BBFC; Tue, 30 Apr 2024 10:42:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1714473722; bh=WPOt4jvOjGtGbyrLuU2d1F2V1ai0lr6lWF33pL4trKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JRaqBN49XO7YTa2ng0CW1yXFJb69RYFP5s3zRow/fnhoDcsuAfb1iEm7sQvUBN4Uo YJv8tmveujFHBjC0bTsYdcZ2eE/LPGheG1pVwxCWANURcGWAQ6GyG+rAg+wgczrjWV 0z6mPsFBmYuHIyzxHYIvWjKB2ZWMoojs2m31/lr0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Ahern , Arnd Bergmann , Eric Dumazet , Paolo Abeni , Sasha Levin Subject: [PATCH 4.19 05/77] ipv6: fib: hide unused pn variable Date: Tue, 30 Apr 2024 12:38:44 +0200 Message-ID: <20240430103041.277892630@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430103041.111219002@linuxfoundation.org> References: <20240430103041.111219002@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann [ Upstream commit 74043489fcb5e5ca4074133582b5b8011b67f9e7 ] When CONFIG_IPV6_SUBTREES is disabled, the only user is hidden, causing a 'make W=1' warning: net/ipv6/ip6_fib.c: In function 'fib6_add': net/ipv6/ip6_fib.c:1388:32: error: variable 'pn' set but not used [-Werror=unused-but-set-variable] Add another #ifdef around the variable declaration, matching the other uses in this file. Fixes: 66729e18df08 ("[IPV6] ROUTE: Make sure we have fn->leaf when adding a node on subtree.") Link: https://lore.kernel.org/netdev/20240322131746.904943-1-arnd@kernel.org/ Reviewed-by: David Ahern Signed-off-by: Arnd Bergmann Reviewed-by: Eric Dumazet Link: https://lore.kernel.org/r/20240408074219.3030256-1-arnd@kernel.org Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/ipv6/ip6_fib.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 63fb9e01eb4e1..844a5ee7f76f2 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -1226,7 +1226,10 @@ int fib6_add(struct fib6_node *root, struct fib6_info *rt, struct nl_info *info, struct netlink_ext_ack *extack) { struct fib6_table *table = rt->fib6_table; - struct fib6_node *fn, *pn = NULL; + struct fib6_node *fn; +#ifdef CONFIG_IPV6_SUBTREES + struct fib6_node *pn = NULL; +#endif int err = -ENOMEM; int allow_create = 1; int replace_required = 0; @@ -1251,9 +1254,9 @@ int fib6_add(struct fib6_node *root, struct fib6_info *rt, goto out; } +#ifdef CONFIG_IPV6_SUBTREES pn = fn; -#ifdef CONFIG_IPV6_SUBTREES if (rt->fib6_src.plen) { struct fib6_node *sn; -- 2.43.0