From nobody Mon May 25 05:54:38 2026 Received: from mail-244106.protonmail.ch (mail-244106.protonmail.ch [109.224.244.106]) (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 3CF3533EAF3; Sun, 17 May 2026 22:08:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=109.224.244.106 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779055708; cv=none; b=GhMXFg5fZqZxpxiUE6r+0ZLPfiD/2pOqCHZ3lQldUi1LYoLvulwczVWlDRJm7wD3lvONeIFYkN/bIfz0CzCBDs2yk3wBWxD9tzR3WZvJxjOsGC9d3K4ufiC9mjp9Ry5yOozvH0ux8wNtRSJtk1oYIgoQlBiczKaBCyTKgEwr7VU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779055708; c=relaxed/simple; bh=fUybwcI3Qhke5NXaKBUawwSoKSsPvAZQEP8Mu2rHLMw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OLH5/7JJuhwv1zgvz06exkMqoeYCU9WAMwVnzNCLzLwT1Rk0E1Z0SmQDogZOhDkQlkGOeeRcWtQ8s8+F8ltuxKttRJnGWMxItSY2yqWGeqZ6ULBer6AneC/CBaw089urHZ4R7vqrffao+4S/0ZWwIzSRMvlCCU3wAF8kiweWKGs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vassilevski.com; spf=pass smtp.mailfrom=vassilevski.com; dkim=pass (1024-bit key) header.d=vassilevski.com header.i=@vassilevski.com header.b=ng+CYJnH; arc=none smtp.client-ip=109.224.244.106 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vassilevski.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vassilevski.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=vassilevski.com header.i=@vassilevski.com header.b="ng+CYJnH" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vassilevski.com; s=protonmail; t=1779055700; x=1779314900; bh=yhuZ9PVMA1JtklmBBJx+69LxSoJx/lc5QUYBdIOwS+U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=ng+CYJnH8WXaw4H6LNkwfzjby/h9V45sGAnjlZUgqj9ZOK+ifVeIJjbfAOffGtGDS +Xt5YwHiFuyOSypMB9V69Vb6gT9WMSYsp69tdxo4fLEPghAcU1EzQN9E70FK2jZK4z diXD9mlFzfi/9v0tpfh9lrshZQPtJ1z20kDyb8cM= X-Pm-Submission-Id: 4gJZnR1YTKz1DDXY From: Alexander Vassilevski To: Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Siddharth Vadapalli , Roger Quadros Cc: Dan Carpenter , Chintan Vankar , Christophe JAILLET , netdev@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Alexander Vassilevski Subject: [PATCH v3] net: ethernet: ti: am65-cpsw-nuss: remove dead vid check in slave_add_vid() Date: Sun, 17 May 2026 15:07:57 -0700 Message-ID: <20260517220757.2679458-1-oss@vassilevski.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260515225715.3641804-1-oss@vassilevski.com> References: <20260515225715.3641804-1-oss@vassilevski.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" am65_cpsw_nuss_ndo_slave_add_vid() returns early at the top with: if (!netif_running(ndev) || !vid) return 0; so vid is guaranteed to be non-zero in the rest of the function. The subsequent if (!vid) unreg_mcast =3D port_mask; is therefore unreachable. Drop the dead branch. With that branch gone, unreg_mcast is only ever its initializer value of zero, so drop the variable and pass 0 directly to cpsw_ale_vlan_add_modify(). No functional change. Found by Smatch. Fixes: 7bcffde02152 ("net: ethernet: ti: am65-cpsw-nuss: restore vlan confi= guration while down/up") Reported-by: Dan Carpenter Closes: https://lore.kernel.org/kernel-janitors/aS_lhMwppbDHoEcX@stanley.mo= untain/ Signed-off-by: Alexander Vassilevski Reviewed-by: Siddharth Vadapalli --- Changes in v3: - Combine v1 and v2 into a single cumulative patch Link to v2: https://lore.kernel.org/kernel-janitors/20260517151611.393789= -1-oss@vassilevski.com/ Changes in v2: - Also drop the now-unused unreg_mcast variable; pass 0 directly to cpsw_ale_vlan_add_modify() Link to v1: https://lore.kernel.org/kernel-janitors/20260515225715.364180= 4-1-oss@vassilevski.com/ drivers/net/ethernet/ti/am65-cpsw-nuss.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/etherne= t/ti/am65-cpsw-nuss.c index 7ac75fc8cd..434a310808 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -302,7 +302,7 @@ static int am65_cpsw_nuss_ndo_slave_add_vid(struct net_= device *ndev, { struct am65_cpsw_common *common =3D am65_ndev_to_common(ndev); struct am65_cpsw_port *port =3D am65_ndev_to_port(ndev); - u32 port_mask, unreg_mcast =3D 0; + u32 port_mask; int ret; =20 if (!common->is_emac_mode) @@ -316,11 +316,9 @@ static int am65_cpsw_nuss_ndo_slave_add_vid(struct net= _device *ndev, return ret; =20 port_mask =3D BIT(port->port_id) | ALE_PORT_HOST; - if (!vid) - unreg_mcast =3D port_mask; dev_info(common->dev, "Adding vlan %d to vlan filter\n", vid); ret =3D cpsw_ale_vlan_add_modify(common->ale, vid, port_mask, - unreg_mcast, port_mask, 0); + 0, port_mask, 0); =20 pm_runtime_put(common->dev); return ret; base-commit: e98d21c170b01ddef366f023bbfcf6b31509fa83 --=20 2.43.0