1 files changed, 18 insertions, 4 deletions

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 2e26dced13a1..3bca52c142fe 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -319,6 +319,7 @@ static int skge_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
         struct skge_port *skge = netdev_priv(dev);
         const struct skge_hw *hw = skge->hw;
         u32 supported = skge_supported_modes(hw);
+        int err = 0;
 
         if (ecmd->autoneg == AUTONEG_ENABLE) {
                 ecmd->advertising = supported;
@@ -367,8 +368,14 @@ static int skge_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
         skge->autoneg = ecmd->autoneg;
         skge->advertising = ecmd->advertising;
 
-        if (netif_running(dev))
-                skge_phy_reset(skge);
+        if (netif_running(dev)) {
+                skge_down(dev);
+                err = skge_up(dev);
+                if (err) {
+                        dev_close(dev);
+                        return err;
+                }
+        }
 
         return (0);
 }
@@ -593,6 +600,7 @@ static int skge_set_pauseparam(struct net_device *dev,
 {
         struct skge_port *skge = netdev_priv(dev);
         struct ethtool_pauseparam old;
+        int err = 0;
 
         skge_get_pauseparam(dev, &old);
 
@@ -609,8 +617,14 @@ static int skge_set_pauseparam(struct net_device *dev,
                         skge->flow_control = FLOW_MODE_NONE;
         }
 
-        if (netif_running(dev))
-                skge_phy_reset(skge);
+        if (netif_running(dev)) {
+                skge_down(dev);
+                err = skge_up(dev);
+                if (err) {
+                        dev_close(dev);
+                        return err;
+                }
+        }
 
         return 0;
 }