Re: [PATCH 14/22] e1000: always turn on receives on esb2

2006-12-11 Thread Jeff Garzik

Kok, Auke wrote:

In rare occasions, esb2 systems would end up started without the RX
unit being turned on. Add a check that runs post-init to make sure.

Signed-off-by: Jesse Brandeburg <[EMAIL PROTECTED]>
Signed-off-by: Auke Kok <[EMAIL PROTECTED]>
---

 drivers/net/e1000/e1000_main.c |7 +++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 12f9f61..67fc379 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2673,6 +2673,13 @@ e1000_watchdog(unsigned long data)
netif_wake_queue(netdev);
mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ);
adapter->smartspeed = 0;
+   } else {
+   /* make sure the receive unit is started */
+   if (adapter->hw.mac_type == e1000_80003es2lan) {
+   struct e1000_hw *hw = &adapter->hw;
+   uint32_t rctl = E1000_READ_REG(hw, RCTL);
+   E1000_WRITE_REG(hw, RCTL, rctl | E1000_RCTL_EN);
+   }


seems like feature flag territory to me


-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 14/22] e1000: always turn on receives on esb2

2006-12-08 Thread Kok, Auke

In rare occasions, esb2 systems would end up started without the RX
unit being turned on. Add a check that runs post-init to make sure.

Signed-off-by: Jesse Brandeburg <[EMAIL PROTECTED]>
Signed-off-by: Auke Kok <[EMAIL PROTECTED]>
---

 drivers/net/e1000/e1000_main.c |7 +++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 12f9f61..67fc379 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2673,6 +2673,13 @@ e1000_watchdog(unsigned long data)
netif_wake_queue(netdev);
mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ);
adapter->smartspeed = 0;
+   } else {
+   /* make sure the receive unit is started */
+   if (adapter->hw.mac_type == e1000_80003es2lan) {
+   struct e1000_hw *hw = &adapter->hw;
+   uint32_t rctl = E1000_READ_REG(hw, RCTL);
+   E1000_WRITE_REG(hw, RCTL, rctl | E1000_RCTL_EN);
+   }
}
} else {
if (netif_carrier_ok(netdev)) {



---
Auke Kok <[EMAIL PROTECTED]>
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html