From bfc9ceda3324b7eb4ee4a480c596180c734a9daf Mon Sep 17 00:00:00 2001 From: Eddie Wai Date: Wed, 27 Jun 2012 15:08:20 +0000 Subject: [PATCH] --- yaml --- r: 314675 b: refs/heads/master c: 78ea22e8042b8a55c5a047869ed1fd9b3711340c h: refs/heads/master i: 314673: 309115a0055eccc131f6baece9cb58b455fa97d1 314671: 20d6faebadd64c699dc37f7a269109616868395d v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/cnic.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 80c433980805..b24d46b44da4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2028b2376a858cb68a7fcc129f6508f59b45381 +refs/heads/master: 78ea22e8042b8a55c5a047869ed1fd9b3711340c diff --git a/trunk/drivers/net/ethernet/broadcom/cnic.c b/trunk/drivers/net/ethernet/broadcom/cnic.c index 31b05ad325d0..5980443cb895 100644 --- a/trunk/drivers/net/ethernet/broadcom/cnic.c +++ b/trunk/drivers/net/ethernet/broadcom/cnic.c @@ -4988,8 +4988,14 @@ static int cnic_start_bnx2x_hw(struct cnic_dev *dev) cp->port_mode = CHIP_PORT_MODE_NONE; if (BNX2X_CHIP_IS_E2_PLUS(cp->chip_id)) { - u32 val = CNIC_RD(dev, MISC_REG_PORT4MODE_EN_OVWR); + u32 val; + + pci_read_config_dword(dev->pcidev, PCICFG_ME_REGISTER, &val); + cp->func = (u8) ((val & ME_REG_ABS_PF_NUM) >> + ME_REG_ABS_PF_NUM_SHIFT); + func = CNIC_FUNC(cp); + val = CNIC_RD(dev, MISC_REG_PORT4MODE_EN_OVWR); if (!(val & 1)) val = CNIC_RD(dev, MISC_REG_PORT4MODE_EN); else