Received-SPF: pass (google.com: domain of linux-kernel+bounces-22039-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
To: "David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>,
	Paolo Abeni <pabeni@redhat.com>,
	Florian Westphal <fw@strlen.de>
Cc: netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	kernel@openvz.org,
	Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Subject: [PATCH 2/4] netfilter: nf_queue: remove excess nf_bridge variable
Date: Wed, 10 Jan 2024 19:00:12 +0800
Message-ID: <20240110110451.5473-3-ptikhomirov@virtuozzo.com>
In-Reply-To: <20240110110451.5473-1-ptikhomirov@virtuozzo.com>
References: <20240110110451.5473-1-ptikhomirov@virtuozzo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?hkrJ1rlJBmOL54YRBQe93sGySjyXSOnTcEtWIZRT74i0kKcKeaeQWWIEbLD7?=
 =?us-ascii?Q?OIJ2dZtMZNObT1JfW92fqujwaLmcfB5SiE+87PzRGEKKZ0qvp4Z6gpu9p8wC?=
 =?us-ascii?Q?Q+Mwmsd39ioojld0BsermzQ39ALPsp1VK0FPpYfde3x9Q1Jy6gZVnvPWu1jR?=
 =?us-ascii?Q?jK8R8tbQKaDSZYHNyyAMNZO4vu0JVT83K9+sUCmPsOH7SnnVpDHkr2J9Nr/e?=
 =?us-ascii?Q?CtkeXxPGbnDl8MgTSX0yAT8Wfa+ieWwgPQ3eJHERJ30a3ZM5awJtNVA+ouSV?=
 =?us-ascii?Q?8ITdTOQ7fIs7SWX6mico802tB/nypRG90dXE+jHyavdgO2qnzzTdQXM64AG+?=
 =?us-ascii?Q?3pMbYdKErNnIzgWxZS/do689VXRs86zU5jGyGJOwy8Sn78awDbRgkkPPgoLv?=
 =?us-ascii?Q?84G8QbvxiM/4E3EhikVjF9KqLYIzNbLTfJir6c2ByIQvEbUyAt2skaxwKtbb?=
 =?us-ascii?Q?0rAt+gYp+PmN+ov85vL6vsLBA8hQPTZ01G8vWa2ylsNBq1mso4/l5qMjZ7Je?=
 =?us-ascii?Q?bX/HnnmmXi8Jer5E7Z4yvU6nwKDt6rg+QyPRfR5eSq8a5vmul0qNxeRPeARe?=
 =?us-ascii?Q?nokK8Yw3XdmBao/uZqng+9nExCg4x6+DDb1IM7WnUDPM9Eg3wgR3Zy5NHMZh?=
 =?us-ascii?Q?3MjauH5gNr9F7t2ActRRADxZDcgInIk0mfR7zyoxo6YBrVUTLKFpn1zJUlxn?=
 =?us-ascii?Q?I1azMy7tpOrOJw2eTBcwEGcfP8z2O4PjjmGd2Q3A9TTG9bGLSz6tVS+JSLls?=
 =?us-ascii?Q?w4s1T7TfEIiDNiX0bXNkqMSLiKt8f+qpHy3yq91BAjvKgggfr4rXofqDQFXv?=
 =?us-ascii?Q?KPu/jdQ0JKFHzRUApyxU0PtpOG1ByGrL5fHgm5mhb2YlGBoEJxwqBUcFxO6o?=
 =?us-ascii?Q?PWApp2ACZX/mODwgA0H8gR5yi107gVW9NFb8UosXUCAP4kwV0MNXaGPFgZxT?=
 =?us-ascii?Q?gbOvec/fh9IiQD8075FDwzxa6k9BfpGssBoSZhbs8632VKxtzCCneQzWdK7k?=
 =?us-ascii?Q?Hc1uhgn4lgu0Bg0ahYKH3atmo5Povc5E4NbzqISI7SFkw+Qnfd/pRiZ38bhe?=
 =?us-ascii?Q?zmAJ+x6v8MPOomSTQduW/X7L39ko7n4A3IqdTlV4bDtL1w2DiMCFn8gNLfK1?=
 =?us-ascii?Q?i5gCXTPeg+NIfmsXBlL8SlJ+D6BG42NGLst/aczSFuzjht60XkLTJe1ZlINA?=
 =?us-ascii?Q?hMG6abxd7kH7TkI0NKzZAGDf+UmOzZXjRonpo7ys31E4woecuvmZMAER8UB/?=
 =?us-ascii?Q?PoID2M22Ep9q7Qk36DPyl79TshennoMxGL9XyyydaQ7dx/IiVX0vwwVy6sx+?=
 =?us-ascii?Q?/tVgLo5xR/cSswxynjkez28yKfyIjxOumEa5jRdgZGVXp18QqAxWLyP3rtG0?=
 =?us-ascii?Q?DcMYKPSieEjgJNLn/XoW93aBLYonvaUB854LtDJZJ6nz927fHZMGLzmHpF4W?=
 =?us-ascii?Q?JynoCG2lGIot2vXh9jElMZXnyGkxiq0ffC+v2E2+PrtOh6PjKa4JrXZyUdHd?=
 =?us-ascii?Q?9feQ0QtkvjuB0EnbFGYVdwSFG0Gez1N86tsafQywN/EK4msAaoAE9qhg9yRE?=
 =?us-ascii?Q?zkKNnpO7oSvSeR36jyODiujGd1V6a1bVgoMoWUsCC+cvMpERvmLOfF8uW0dP?=
 =?us-ascii?Q?RWRJVgoCOMuSsy0aAVodl9HCvDCokYjy1zOevK8oFTnQZwggRcfe08+kcG2Y?=
 =?us-ascii?Q?jW2NqA=3D=3D?=
X-OriginatorOrg: virtuozzo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7a1a5e26-d572-4c67-f30f-08dc11cc07fd
X-MS-Exchange-CrossTenant-AuthSource: DU0PR08MB9003.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2024 11:05:18.8203
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: eUPiaaY8yMHlDPm9yHRYadVFX2W3JcZukoLQRJhZa4wuixTm637u5JfNUkWyBY90eA/bHS20gdin4j2FWbsUqZhURVbXJ6sQxMV9n1rQQi0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5990

We don't really need nf_bridge variable here. And nf_bridge_info_exists
is better replacement for nf_bridge_info_get in case we are only
checking for existance.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 net/netfilter/nf_queue.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
index 63d1516816b1f..3dfcb3ac5cb44 100644
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
@@ -82,10 +82,8 @@ static void __nf_queue_entry_init_physdevs(struct nf_queue_entry *entry)
 {
 #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
 	const struct sk_buff *skb = entry->skb;
-	struct nf_bridge_info *nf_bridge;
 
-	nf_bridge = nf_bridge_info_get(skb);
-	if (nf_bridge) {
+	if (nf_bridge_info_exists(skb)) {
 		entry->physin = nf_bridge_get_physindev(skb);
 		entry->physout = nf_bridge_get_physoutdev(skb);
 	} else {
-- 
2.43.0