From: Yaniv Rosner Date: Wed, 4 Apr 2012 01:29:00 +0000 (+0000) Subject: bnx2x: Fix BCM84833 PHY FW version presentation X-Git-Tag: v2.6.39-400.9.0~338^2~79 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=62a87a82d277b6ec4a25f5eafdfe12afd6ec47b7;p=users%2Fjedix%2Flinux-maple.git bnx2x: Fix BCM84833 PHY FW version presentation (cherry picked from commit 8267bbb01f005fa8d0c8d046ecc24ae0b52e4d70) Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller Signed-off-by: Joe Jin --- diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c index 8064588474d6..4cd889a19b89 100644 --- a/drivers/net/bnx2x/bnx2x_link.c +++ b/drivers/net/bnx2x/bnx2x_link.c @@ -9286,8 +9286,7 @@ static void bnx2x_save_848xx_spirom_version(struct bnx2x_phy *phy, if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) { bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD, 0x400f, &fw_ver1); - bnx2x_save_spirom_version(bp, port, - ((fw_ver1 & 0xf000)>>5) | (fw_ver1 & 0x7f), + bnx2x_save_spirom_version(bp, port, fw_ver1 & 0xfff, phy->ver_addr); } else { /* For 32-bit registers in 848xx, access via MDIO2ARM i/f. */