gianfar: Add missing graceful reset steps and fixes

[karo-tx-linux.git] / drivers / net / ethernet / freescale / gianfar_ethtool.c

diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
index 5900dbaec242e1a8a9a6e183b872a884e2037b8d..69fab72b8a8db925899c3644e9103ecf5ba73475 100644 (file)
--- a/drivers/net/ethernet/freescale/gianfar_ethtool.c
+++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
@@ -22,7 +22,6 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
-#include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -45,7 +44,6 @@
 
 #include "gianfar.h"
 
-extern void gfar_start(struct net_device *dev);
 extern int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue,
                              int rx_work_limit);
 
@@ -505,7 +503,7 @@ static int gfar_sringparam(struct net_device *dev,
                lock_tx_qs(priv);
                lock_rx_qs(priv);
 
-               gfar_halt(dev);
+               gfar_halt(priv);
 
                unlock_rx_qs(priv);
                unlock_tx_qs(priv);
@@ -628,7 +626,7 @@ int gfar_set_features(struct net_device *dev, netdev_features_t features)
                lock_tx_qs(priv);
                lock_rx_qs(priv);
 
-               gfar_halt(dev);
+               gfar_halt(priv);
 
                unlock_tx_qs(priv);
                unlock_rx_qs(priv);