Update from 2.6.36 to 2.6.36.4wip-dissipation-jerickso

1 files changed, 18 insertions, 4 deletions

diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index 99f24f5cac53..f0643ac4aff1 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -1575,6 +1575,16 @@ jme_free_irq(struct jme_adapter *jme)
         }
 }
 
+static inline void
+jme_phy_on(struct jme_adapter *jme)
+{
+        u32 bmcr;
+
+        bmcr = jme_mdio_read(jme->dev, jme->mii_if.phy_id, MII_BMCR);
+        bmcr &= ~BMCR_PDOWN;
+        jme_mdio_write(jme->dev, jme->mii_if.phy_id, MII_BMCR, bmcr);
+}
+
 static int
 jme_open(struct net_device *netdev)
 {
@@ -1595,10 +1605,12 @@ jme_open(struct net_device *netdev)
 
         jme_start_irq(jme);
 
-        if (test_bit(JME_FLAG_SSET, &jme->flags))
+        if (test_bit(JME_FLAG_SSET, &jme->flags)) {
+                jme_phy_on(jme);
                 jme_set_settings(netdev, &jme->old_ecmd);
-        else
+        } else {
                 jme_reset_phy_processor(jme);
+        }
 
         jme_reset_link(jme);
 
@@ -3006,10 +3018,12 @@ jme_resume(struct pci_dev *pdev)
         jme_clear_pm(jme);
         pci_restore_state(pdev);
 
-        if (test_bit(JME_FLAG_SSET, &jme->flags))
+        if (test_bit(JME_FLAG_SSET, &jme->flags)) {
+                jme_phy_on(jme);
                 jme_set_settings(netdev, &jme->old_ecmd);
-        else
+        } else {
                 jme_reset_phy_processor(jme);
+        }
 
         jme_start_irq(jme);
         netif_device_attach(netdev);