From 63c64ac13ba7488a1325d2a98d42ee493e522941 Mon Sep 17 00:00:00 2001
From: Eilon Greenstein <eilong@broadcom.com>
Date: Thu, 12 Feb 2009 08:37:04 +0000
Subject: [PATCH] --- yaml --- r: 134540 b: refs/heads/master c:
 811a2f2d3be9a39bd4e0930501fda8630857748d h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/bnx2x_link.c | 6 ++++--
 trunk/drivers/net/bnx2x_reg.h  | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0e4b24033348..54b0e9206e42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a35da8dbf1ff403633bb6256fba691b224f17f61
+refs/heads/master: 811a2f2d3be9a39bd4e0930501fda8630857748d
diff --git a/trunk/drivers/net/bnx2x_link.c b/trunk/drivers/net/bnx2x_link.c
index ffa412f63c96..f4c699ecfb41 100644
--- a/trunk/drivers/net/bnx2x_link.c
+++ b/trunk/drivers/net/bnx2x_link.c
@@ -297,8 +297,10 @@ static u8 bnx2x_emac_enable(struct link_params *params,
 			   port*4, 0);
 	}
 
-	/* enable emac */
-	REG_WR(bp, NIG_REG_NIG_EMAC0_EN + port*4, 1);
+	bnx2x_bits_en(bp, emac_base + EMAC_REG_EMAC_RX_MODE,
+		    EMAC_RX_MODE_RESET);
+	bnx2x_bits_en(bp, emac_base + EMAC_REG_EMAC_TX_MODE,
+		    EMAC_TX_MODE_RESET);
 
 	if (CHIP_REV_IS_SLOW(bp)) {
 		/* config GMII mode */
diff --git a/trunk/drivers/net/bnx2x_reg.h b/trunk/drivers/net/bnx2x_reg.h
index 5cfeac96ea69..b6c924934a00 100644
--- a/trunk/drivers/net/bnx2x_reg.h
+++ b/trunk/drivers/net/bnx2x_reg.h
@@ -5173,9 +5173,11 @@
 #define EMAC_RX_MODE_FLOW_EN					 (1L<<2)
 #define EMAC_RX_MODE_KEEP_VLAN_TAG				 (1L<<10)
 #define EMAC_RX_MODE_PROMISCUOUS				 (1L<<8)
+#define EMAC_RX_MODE_RESET					 (1L<<0)
 #define EMAC_RX_MTU_SIZE_JUMBO_ENA				 (1L<<31)
 #define EMAC_TX_MODE_EXT_PAUSE_EN				 (1L<<3)
 #define EMAC_TX_MODE_FLOW_EN					 (1L<<4)
+#define EMAC_TX_MODE_RESET					 (1L<<0)
 #define MISC_REGISTERS_GPIO_0					 0
 #define MISC_REGISTERS_GPIO_1					 1
 #define MISC_REGISTERS_GPIO_2					 2