From a2e077a3ef8a9b61908e2e49efb6446e5420aac6 Mon Sep 17 00:00:00 2001 From: Yaniv Rosner Date: Mon, 28 Nov 2011 00:49:49 +0000 Subject: [PATCH] --- yaml --- r: 277991 b: refs/heads/master c: ec15b898a4a812e89a63b8e52bc11d4e84d74db1 h: refs/heads/master i: 277989: ff2ee91ca20e603dc25cbd20df120b6d93e1fadf 277987: 62583e847b0da240fe1817d74975431c4e578daf 277983: c87c7c686cd329342dc496451fc31054f1e38c5e v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6f981a1ce43e..37687dc8d498 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 521683da84b824d36b6388d2e7ea96c81eafc699 +refs/heads/master: ec15b898a4a812e89a63b8e52bc11d4e84d74db1 diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c index 6523723b9d1e..4ffc75dfa10a 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c @@ -11308,7 +11308,9 @@ static int bnx2x_populate_int_phy(struct bnx2x *bp, u32 shmem_base, u8 port, offsetof(struct shmem_region, dev_info.port_feature_config[port].link_config)) & PORT_FEATURE_CONNECTED_SWITCH_MASK); - chip_id = REG_RD(bp, MISC_REG_CHIP_NUM) << 16; + chip_id = (REG_RD(bp, MISC_REG_CHIP_NUM) << 16) | + ((REG_RD(bp, MISC_REG_CHIP_REV) & 0xf) << 12); + DP(NETIF_MSG_LINK, ":chip_id = 0x%x\n", chip_id); if (USES_WARPCORE(bp)) { u32 serdes_net_if;