From 6fbc2f9127d1475744255ce507a270e52ce98522 Mon Sep 17 00:00:00 2001 From: Eilon Greenstein Date: Mon, 2 Mar 2009 08:00:10 +0000 Subject: [PATCH] --- yaml --- r: 135022 b: refs/heads/master c: 3b313b618b2acbeb2954368980ab52b7f9fd05ef h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2x_link.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 59dcc4774cdc..3133e40790b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7bc788beca5879f03e0120ac27b99bdeed95921 +refs/heads/master: 3b313b618b2acbeb2954368980ab52b7f9fd05ef diff --git a/trunk/drivers/net/bnx2x_link.c b/trunk/drivers/net/bnx2x_link.c index 280f008c616d..c72a964274a8 100644 --- a/trunk/drivers/net/bnx2x_link.c +++ b/trunk/drivers/net/bnx2x_link.c @@ -3033,10 +3033,9 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars) MDIO_WIS_DEVAD, MDIO_WIS_REG_LASI_CNTL, 0x1); - bnx2x_save_bcm_spirom_ver(bp, params->port, - ext_phy_type, - ext_phy_addr, - params->shmem_base); + /* BCM8705 doesn't have microcode, hence the 0 */ + bnx2x_save_spirom_version(bp, params->port, + params->shmem_base, 0); break; case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706: