diff options
| author | Eilon Greenstein <eilong@broadcom.com> | 2009-08-12 04:24:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-13 02:02:57 -0400 |
| commit | 659bc5c4f2e84e69e1b10b36c16cd52ff7eb317a (patch) | |
| tree | 4ceb09fc60606b7772f0999f826c31ab4799bda8 /drivers/net/bnx2x_main.c | |
| parent | 1ef70b9c12407f0bf332ba775a8aa8f8035d0a24 (diff) | |
bnx2x: Using macro for phy address
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x_main.c')
| -rw-r--r-- | drivers/net/bnx2x_main.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index 1e8e7e1efbd6..d22c6b7f7da6 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c | |||
| @@ -8546,9 +8546,7 @@ static void __devinit bnx2x_get_port_hwinfo(struct bnx2x *bp) | |||
| 8546 | else if ((ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE) && | 8546 | else if ((ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE) && |
| 8547 | (ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN)) | 8547 | (ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN)) |
| 8548 | bp->mdio.prtad = | 8548 | bp->mdio.prtad = |
| 8549 | (bp->link_params.ext_phy_config & | 8549 | XGXS_EXT_PHY_ADDR(bp->link_params.ext_phy_config); |
| 8550 | PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >> | ||
| 8551 | PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT; | ||
| 8552 | 8550 | ||
| 8553 | val2 = SHMEM_RD(bp, dev_info.port_hw_config[port].mac_upper); | 8551 | val2 = SHMEM_RD(bp, dev_info.port_hw_config[port].mac_upper); |
| 8554 | val = SHMEM_RD(bp, dev_info.port_hw_config[port].mac_lower); | 8552 | val = SHMEM_RD(bp, dev_info.port_hw_config[port].mac_lower); |
| @@ -9549,9 +9547,7 @@ static int bnx2x_set_eeprom(struct net_device *dev, | |||
| 9549 | if (XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config) == | 9547 | if (XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config) == |
| 9550 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101) { | 9548 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101) { |
| 9551 | u8 ext_phy_addr = | 9549 | u8 ext_phy_addr = |
| 9552 | (bp->link_params.ext_phy_config & | 9550 | XGXS_EXT_PHY_ADDR(bp->link_params.ext_phy_config); |
| 9553 | PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >> | ||
| 9554 | PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT; | ||
| 9555 | 9551 | ||
| 9556 | /* DSP Remove Download Mode */ | 9552 | /* DSP Remove Download Mode */ |
| 9557 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0, | 9553 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0, |