{"id":2209930,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2209930/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260312175702.28603-1-fw@strlen.de/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.2/projects/26/?format=json","name":"Netfilter Development","link_name":"netfilter-devel","list_id":"netfilter-devel.vger.kernel.org","list_email":"netfilter-devel@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260312175702.28603-1-fw@strlen.de>","list_archive_url":null,"date":"2026-03-12T17:56:59","name":"[nf-next] netfilter: nf_conntrack_sip: remove net variable shadowing","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"9fe811cf620f74d27c9a830e1860adbdcc050d05","submitter":{"id":1025,"url":"http://patchwork.ozlabs.org/api/1.2/people/1025/?format=json","name":"Florian Westphal","email":"fw@strlen.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260312175702.28603-1-fw@strlen.de/mbox/","series":[{"id":495661,"url":"http://patchwork.ozlabs.org/api/1.2/series/495661/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=495661","date":"2026-03-12T17:56:59","name":"[nf-next] netfilter: nf_conntrack_sip: remove net variable shadowing","version":1,"mbox":"http://patchwork.ozlabs.org/series/495661/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2209930/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2209930/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n <netfilter-devel+bounces-11160-incoming=patchwork.ozlabs.org@vger.kernel.org>","X-Original-To":["incoming@patchwork.ozlabs.org","netfilter-devel@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c09:e001:a7::12fc:5321; helo=sto.lore.kernel.org;\n envelope-from=netfilter-devel+bounces-11160-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=91.216.245.30","smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=strlen.de","smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=Chamillionaire.breakpoint.cc"],"Received":["from sto.lore.kernel.org (sto.lore.kernel.org\n [IPv6:2600:3c09:e001:a7::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fWwLT25vsz1xy3\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 13 Mar 2026 04:57:21 +1100 (AEDT)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sto.lore.kernel.org (Postfix) with ESMTP id 3D78D3007884\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 12 Mar 2026 17:57:12 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 281D73FE64F;\n\tThu, 12 Mar 2026 17:57:11 +0000 (UTC)","from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc\n [91.216.245.30])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C4D43321C2\n\tfor <netfilter-devel@vger.kernel.org>; Thu, 12 Mar 2026 17:57:09 +0000 (UTC)","by Chamillionaire.breakpoint.cc (Postfix, from userid 1003)\n\tid 945CF60345; Thu, 12 Mar 2026 18:57:07 +0100 (CET)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1773338230; cv=none;\n b=Ba8r0AFcrOnthHnGdp68/4LooJOSWzrddh7EICqC/SvbG1QKyMeuRdK8uVRH83FNy9xF56FHGZWgYRWN78PhXxPG3fXyl5AdP2Dh293e9t4MoufXHGXJO4blPHx1vYAALxlvIs0K9XJbjesDxjuIySfga1lQnata7X3WiKvPOmc=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1773338230; c=relaxed/simple;\n\tbh=gaNvlIAE4MFRxiYMObkqcJ1x6oMrrBMapFx1Ry4VTo4=;\n\th=From:To:Cc:Subject:Date:Message-ID:MIME-Version;\n b=OrZh/EAUwFvZPby5xucm3QJvJHJ8ATneai/erUq/wBnnCGFG91hjxn5mui7434WoaFAmnQPEMe9H62SlWi1V8fvYWC9xJ9eqyeGlxtWcdFrn2j7y4wRE72ukX8eCOeTTnWe63vxPfvDWPjI83K1bXTCCx2U6VvZHLn/bjQuOEf0=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=strlen.de;\n spf=pass smtp.mailfrom=Chamillionaire.breakpoint.cc;\n arc=none smtp.client-ip=91.216.245.30","From":"Florian Westphal <fw@strlen.de>","To":"<netfilter-devel@vger.kernel.org>","Cc":"Florian Westphal <fw@strlen.de>","Subject":"[PATCH nf-next] netfilter: nf_conntrack_sip: remove net variable\n shadowing","Date":"Thu, 12 Mar 2026 18:56:59 +0100","Message-ID":"<20260312175702.28603-1-fw@strlen.de>","X-Mailer":"git-send-email 2.52.0","Precedence":"bulk","X-Mailing-List":"netfilter-devel@vger.kernel.org","List-Id":"<netfilter-devel.vger.kernel.org>","List-Subscribe":"<mailto:netfilter-devel+subscribe@vger.kernel.org>","List-Unsubscribe":"<mailto:netfilter-devel+unsubscribe@vger.kernel.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit"},"content":"net is already set, derived from nf_conn.\nI don't see how the device could be living in a different netns\nthan the conntrack entry.\n\nRemove the extra variable and re-use existing one.\n\nSigned-off-by: Florian Westphal <fw@strlen.de>\n---\n net/netfilter/nf_conntrack_sip.c | 3 +--\n 1 file changed, 1 insertion(+), 2 deletions(-)","diff":"diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c\nindex ca748f8dbff1..2a60a425880d 100644\n--- a/net/netfilter/nf_conntrack_sip.c\n+++ b/net/netfilter/nf_conntrack_sip.c\n@@ -869,9 +869,8 @@ static int set_expected_rtp_rtcp(struct sk_buff *skb, unsigned int protoff,\n \t\tsaddr = &ct->tuplehash[!dir].tuple.src.u3;\n \t} else if (sip_external_media) {\n \t\tstruct net_device *dev = skb_dst(skb)->dev;\n-\t\tstruct net *net = dev_net(dev);\n-\t\tstruct flowi fl;\n \t\tstruct dst_entry *dst = NULL;\n+\t\tstruct flowi fl;\n \n \t\tmemset(&fl, 0, sizeof(fl));\n \n","prefixes":["nf-next"]}