From 8645192f8dcd5419a1ad7ad0a1b4b44c7d3b36d3 Mon Sep 17 00:00:00 2001
From: Eilon Greenstein <eilong@broadcom.com>
Date: Wed, 14 Jan 2009 21:24:57 -0800
Subject: [PATCH] --- yaml --- r: 129788 b: refs/heads/master c:
 ad33ea3a8d2ec324dc0f46b6ae404d824d2b349b h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/bnx2x_main.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a066762beeec..b5a1f57f3552 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f40f2cba244e04c0f385c5ce60498b513b335dd
+refs/heads/master: ad33ea3a8d2ec324dc0f46b6ae404d824d2b349b
diff --git a/trunk/drivers/net/bnx2x_main.c b/trunk/drivers/net/bnx2x_main.c
index 75b2624cd60b..9b1555820f52 100644
--- a/trunk/drivers/net/bnx2x_main.c
+++ b/trunk/drivers/net/bnx2x_main.c
@@ -1899,7 +1899,8 @@ static int bnx2x_set_spio(struct bnx2x *bp, int spio_num, u32 mode)
 
 static void bnx2x_calc_fc_adv(struct bnx2x *bp)
 {
-	switch (bp->link_vars.ieee_fc) {
+	switch (bp->link_vars.ieee_fc &
+		MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_MASK) {
 	case MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_NONE:
 		bp->port.advertising &= ~(ADVERTISED_Asym_Pause |
 					  ADVERTISED_Pause);