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 4C69B19049B; Mon, 23 Jun 2025 21:54:18 +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=1750715658; cv=none; b=e0qXzq+12wSccw3dg3quQMGG/9Bb2RxgKDZmWhYx8GrDBMq0FqCToebhCCpTkcVTYZFy+4Y4xM6kMmCFi7/UTgSKoXL0jXTOq1q2FJqmEws6IAlqFYl/iUjbHtJA12xtVVlik2jp81LPVdvv9CtksfD2riTCuFCDchpqE8bBHug= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750715658; c=relaxed/simple; bh=I6C8KyKAG6VlTSlVHy7t5qwtkE16zypg+/JSh6cSNhc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HvXf/qDYe4SGX1FuWaXRtve3ynjNnDlOziGmR0Wm8pwmt28jeJETiN6dRcMEPyx/L+LGzZqUbBC8z0np7olTlAzskYuSDyXy5J08qhLj2FMFptpPLz01qQj14IH0mJRPnp6XGPOuI6bRVcLd/RNVJI3p8mI5+UeYA0VHd296v0w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LAhiNvas; 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="LAhiNvas" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF812C4CEEA; Mon, 23 Jun 2025 21:54:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750715658; bh=I6C8KyKAG6VlTSlVHy7t5qwtkE16zypg+/JSh6cSNhc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LAhiNvas6WIT4XqI0ym5txnnLTCfuyvDHu1pdNVH1ENR+EkUsJm7l7nXeDRtb7jHY BXVrp6cNzImezbPPQEv8U9dLofLOrcZ4OM5n6LaYAogsZ63fVAnzW1Lu75IfVaBGoA nGJk16Nj9+VuBmSplbpGuzg4hs37Z4jUv4ZvFbQc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alok Tiwari , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12 199/414] emulex/benet: correct command version selection in be_cmd_get_stats() Date: Mon, 23 Jun 2025 15:05:36 +0200 Message-ID: <20250623130646.985879994@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130642.015559452@linuxfoundation.org> References: <20250623130642.015559452@linuxfoundation.org> User-Agent: quilt/0.68 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 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alok Tiwari [ Upstream commit edb888d29748cee674006a52e544925dacc7728e ] Logic here always sets hdr->version to 2 if it is not a BE3 or Lancer chip, even if it is BE2. Use 'else if' to prevent multiple assignments, setting version 0 for BE2, version 1 for BE3 and Lancer, and version 2 for others. Fixes potential incorrect version setting when BE2_chip and BE3_chip/lancer_chip checks could both be true. Signed-off-by: Alok Tiwari Link: https://patch.msgid.link/20250519141731.691136-1-alok.a.tiwari@oracle.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/emulex/benet/be_cmds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c index 51b8377edd1d0..a89aa4ac0a064 100644 --- a/drivers/net/ethernet/emulex/benet/be_cmds.c +++ b/drivers/net/ethernet/emulex/benet/be_cmds.c @@ -1609,7 +1609,7 @@ int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd) /* version 1 of the cmd is not supported only by BE2 */ if (BE2_chip(adapter)) hdr->version = 0; - if (BE3_chip(adapter) || lancer_chip(adapter)) + else if (BE3_chip(adapter) || lancer_chip(adapter)) hdr->version = 1; else hdr->version = 2; -- 2.39.5