Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bnx2x: correct LPI pass-through configuration

Commit c8c60d88c59cbb48737732ba948663a3efe882aa contained
an incorrect logic which enabled a buffer overflow when accessing
an array during LPI pass-through configuration.
This patch fixes this issue by removing that logic altogether.

Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Yaniv Rosner <yaniv.rosner@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Yuval Mintz and committed by
David S. Miller
79504d70 260762c7

+6 -12
+6 -12
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
··· 4057 4057 MDIO_WC_REG_DIGITAL4_MISC3, val | 0x8080); 4058 4058 4059 4059 /* Enable LPI pass through */ 4060 - if ((params->eee_mode & EEE_MODE_ADV_LPI) && 4061 - (phy->flags & FLAGS_EEE_10GBT) && 4062 - (!(params->eee_mode & EEE_MODE_ENABLE_LPI) || 4063 - bnx2x_eee_calc_timer(params)) && 4064 - (params->req_duplex[bnx2x_phy_selection(params)] == DUPLEX_FULL)) { 4065 - DP(NETIF_MSG_LINK, "Configure WC for LPI pass through\n"); 4066 - bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD, 4067 - MDIO_WC_REG_EEE_COMBO_CONTROL0, 4068 - 0x7c); 4069 - bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD, 4070 - MDIO_WC_REG_DIGITAL4_MISC5, 0xc000); 4071 - } 4060 + DP(NETIF_MSG_LINK, "Configure WC for LPI pass through\n"); 4061 + bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD, 4062 + MDIO_WC_REG_EEE_COMBO_CONTROL0, 4063 + 0x7c); 4064 + bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD, 4065 + MDIO_WC_REG_DIGITAL4_MISC5, 0xc000); 4072 4066 4073 4067 /* 10G XFI Full Duplex */ 4074 4068 bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,