diff options
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r-- | drivers/net/bnx2.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 4ff76e38e788..3d1a5da98622 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -266,7 +266,7 @@ static inline u32 bnx2_tx_avail(struct bnx2 *bp, struct bnx2_tx_ring_info *txr) | |||
266 | if (diff == TX_DESC_CNT) | 266 | if (diff == TX_DESC_CNT) |
267 | diff = MAX_TX_DESC_CNT; | 267 | diff = MAX_TX_DESC_CNT; |
268 | } | 268 | } |
269 | return (bp->tx_ring_size - diff); | 269 | return bp->tx_ring_size - diff; |
270 | } | 270 | } |
271 | 271 | ||
272 | static u32 | 272 | static u32 |
@@ -299,7 +299,7 @@ bnx2_shmem_wr(struct bnx2 *bp, u32 offset, u32 val) | |||
299 | static u32 | 299 | static u32 |
300 | bnx2_shmem_rd(struct bnx2 *bp, u32 offset) | 300 | bnx2_shmem_rd(struct bnx2 *bp, u32 offset) |
301 | { | 301 | { |
302 | return (bnx2_reg_rd_ind(bp, bp->shmem_base + offset)); | 302 | return bnx2_reg_rd_ind(bp, bp->shmem_base + offset); |
303 | } | 303 | } |
304 | 304 | ||
305 | static void | 305 | static void |
@@ -977,9 +977,9 @@ bnx2_report_fw_link(struct bnx2 *bp) | |||
977 | static char * | 977 | static char * |
978 | bnx2_xceiver_str(struct bnx2 *bp) | 978 | bnx2_xceiver_str(struct bnx2 *bp) |
979 | { | 979 | { |
980 | return ((bp->phy_port == PORT_FIBRE) ? "SerDes" : | 980 | return (bp->phy_port == PORT_FIBRE) ? "SerDes" : |
981 | ((bp->phy_flags & BNX2_PHY_FLAG_SERDES) ? "Remote Copper" : | 981 | ((bp->phy_flags & BNX2_PHY_FLAG_SERDES) ? "Remote Copper" : |
982 | "Copper")); | 982 | "Copper"); |
983 | } | 983 | } |
984 | 984 | ||
985 | static void | 985 | static void |
@@ -1758,7 +1758,7 @@ __acquires(&bp->phy_lock) | |||
1758 | u32 new_adv = 0; | 1758 | u32 new_adv = 0; |
1759 | 1759 | ||
1760 | if (bp->phy_flags & BNX2_PHY_FLAG_REMOTE_PHY_CAP) | 1760 | if (bp->phy_flags & BNX2_PHY_FLAG_REMOTE_PHY_CAP) |
1761 | return (bnx2_setup_remote_phy(bp, port)); | 1761 | return bnx2_setup_remote_phy(bp, port); |
1762 | 1762 | ||
1763 | if (!(bp->autoneg & AUTONEG_SPEED)) { | 1763 | if (!(bp->autoneg & AUTONEG_SPEED)) { |
1764 | u32 new_bmcr; | 1764 | u32 new_bmcr; |
@@ -2171,10 +2171,10 @@ __acquires(&bp->phy_lock) | |||
2171 | return 0; | 2171 | return 0; |
2172 | 2172 | ||
2173 | if (bp->phy_flags & BNX2_PHY_FLAG_SERDES) { | 2173 | if (bp->phy_flags & BNX2_PHY_FLAG_SERDES) { |
2174 | return (bnx2_setup_serdes_phy(bp, port)); | 2174 | return bnx2_setup_serdes_phy(bp, port); |
2175 | } | 2175 | } |
2176 | else { | 2176 | else { |
2177 | return (bnx2_setup_copper_phy(bp)); | 2177 | return bnx2_setup_copper_phy(bp); |
2178 | } | 2178 | } |
2179 | } | 2179 | } |
2180 | 2180 | ||
@@ -7582,9 +7582,9 @@ bnx2_set_tx_csum(struct net_device *dev, u32 data) | |||
7582 | struct bnx2 *bp = netdev_priv(dev); | 7582 | struct bnx2 *bp = netdev_priv(dev); |
7583 | 7583 | ||
7584 | if (CHIP_NUM(bp) == CHIP_NUM_5709) | 7584 | if (CHIP_NUM(bp) == CHIP_NUM_5709) |
7585 | return (ethtool_op_set_tx_ipv6_csum(dev, data)); | 7585 | return ethtool_op_set_tx_ipv6_csum(dev, data); |
7586 | else | 7586 | else |
7587 | return (ethtool_op_set_tx_csum(dev, data)); | 7587 | return ethtool_op_set_tx_csum(dev, data); |
7588 | } | 7588 | } |
7589 | 7589 | ||
7590 | static int | 7590 | static int |
@@ -7705,7 +7705,7 @@ bnx2_change_mtu(struct net_device *dev, int new_mtu) | |||
7705 | return -EINVAL; | 7705 | return -EINVAL; |
7706 | 7706 | ||
7707 | dev->mtu = new_mtu; | 7707 | dev->mtu = new_mtu; |
7708 | return (bnx2_change_ring_size(bp, bp->rx_ring_size, bp->tx_ring_size)); | 7708 | return bnx2_change_ring_size(bp, bp->rx_ring_size, bp->tx_ring_size); |
7709 | } | 7709 | } |
7710 | 7710 | ||
7711 | #ifdef CONFIG_NET_POLL_CONTROLLER | 7711 | #ifdef CONFIG_NET_POLL_CONTROLLER |