diff options
| author | Yuval Mintz <yuvalmin@broadcom.com> | 2012-07-23 10:25:43 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-23 00:58:21 -0700 |
| commit | c3def943c7117d42caaed3478731ea7c3c87190e (patch) | |
| tree | e3996b38c1b3627dbaab78542f65b27f11d9feeb /drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | |
| parent | 9a0a9502cbf19d31f7387e3066f3d1a491bef616 (diff) | |
| download | op-kernel-dev-c3def943c7117d42caaed3478731ea7c3c87190e.zip op-kernel-dev-c3def943c7117d42caaed3478731ea7c3c87190e.tar.gz | |
bnx2x: Add new 57840 device IDs
The 57840 boards come in two flavours: 2 x 20G and 4 x 10G.
To better differentiate between the two flavours, a separate device ID
was assigned to each.
The silicon default value is still the currently supported 57840 device ID
(0x168d), and since a user can damage the nvram (e.g., 'ethtool -E')
the driver will still support this device ID to allow the user to amend the
nvram back into a supported configuration.
Notice this patch contains lines longer than 80 characters (strings).
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c index e04b282..f4beb46 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c @@ -1718,7 +1718,7 @@ static void bnx2x_xmac_init(struct link_params *params, u32 max_speed) * ports of the path */ - if ((CHIP_NUM(bp) == CHIP_NUM_57840) && + if ((CHIP_NUM(bp) == CHIP_NUM_57840_4_10) && (REG_RD(bp, MISC_REG_RESET_REG_2) & MISC_REGISTERS_RESET_REG_2_XMAC)) { DP(NETIF_MSG_LINK, |
