aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2008-01-31 20:07:21 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-31 22:28:28 -0500
commitc26736ec171760a41307d775bbf05983ea45ea9e (patch)
tree35dede0a1ce2f74f53ec4d5d9542dac99e595c48 /drivers
parent29e75252da20f3ab9e132c68c9aed156b87beae6 (diff)
[BNX2]: Fix ASYM PAUSE advertisement for remote PHY.
We were checking for the ASYM_PAUSE bit for 1000Base-X twice instead checking for both the 1000Base-X bit and the 10/100/1000Base-T bit. The purpose of the logic is to tell the firmware that ASYM_PAUSE is set on either the Serdes or Copper interface. Problem was discovered by Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/bnx2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index b176b8db3a3e..8b552c6dd2e7 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -1429,7 +1429,7 @@ bnx2_setup_remote_phy(struct bnx2 *bp, u8 port)
1429 1429
1430 if (pause_adv & (ADVERTISE_1000XPAUSE | ADVERTISE_PAUSE_CAP)) 1430 if (pause_adv & (ADVERTISE_1000XPAUSE | ADVERTISE_PAUSE_CAP))
1431 speed_arg |= BNX2_NETLINK_SET_LINK_FC_SYM_PAUSE; 1431 speed_arg |= BNX2_NETLINK_SET_LINK_FC_SYM_PAUSE;
1432 if (pause_adv & (ADVERTISE_1000XPSE_ASYM | ADVERTISE_1000XPSE_ASYM)) 1432 if (pause_adv & (ADVERTISE_1000XPSE_ASYM | ADVERTISE_PAUSE_ASYM))
1433 speed_arg |= BNX2_NETLINK_SET_LINK_FC_ASYM_PAUSE; 1433 speed_arg |= BNX2_NETLINK_SET_LINK_FC_ASYM_PAUSE;
1434 1434
1435 if (port == PORT_TP) 1435 if (port == PORT_TP)