]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
emulex/benet: correct command version selection in be_cmd_get_stats()
authorAlok Tiwari <alok.a.tiwari@oracle.com>
Mon, 19 May 2025 14:17:19 +0000 (07:17 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:04:17 +0000 (11:04 +0100)
[ 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 <alok.a.tiwari@oracle.com>
Link: https://patch.msgid.link/20250519141731.691136-1-alok.a.tiwari@oracle.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/emulex/benet/be_cmds.c

index 9812a9a5d033bda20a5deea02a31ad4aaa7b7e5e..d9bceb26f4e5b0765c67873f08deaad8b8ee38f1 100644 (file)
@@ -1608,7 +1608,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;