Merge branch 'origin' into devel-stable

[linux-2.6-block.git] / drivers / net / stmmac / stmmac_ethtool.c

diff --git a/drivers/net/stmmac/stmmac_ethtool.c b/drivers/net/stmmac/stmmac_ethtool.c
index 694ebe6a07582f93e81a3fdee272c2ae348109c3..c021eaa3ca69662a6fa5e32cc218f73f591455cf 100644 (file)
--- a/drivers/net/stmmac/stmmac_ethtool.c
+++ b/drivers/net/stmmac/stmmac_ethtool.c
@@ -28,6 +28,7 @@
 #include <linux/phy.h>
 
 #include "stmmac.h"
+#include "dwmac_dma.h"
 
 #define REG_SPACE_SIZE 0x1054
 #define MAC100_ETHTOOL_NAME    "st_mac100"
@@ -61,7 +62,7 @@ static const struct  stmmac_stats stmmac_gstrings_stats[] = {
        STMMAC_STAT(rx_toolong),
        STMMAC_STAT(rx_collision),
        STMMAC_STAT(rx_crc),
-       STMMAC_STAT(rx_lenght),
+       STMMAC_STAT(rx_length),
        STMMAC_STAT(rx_mii),
        STMMAC_STAT(rx_multicast),
        STMMAC_STAT(rx_gmac_overflow),
@@ -268,8 +269,8 @@ stmmac_set_pauseparam(struct net_device *netdev,
                }
        } else {
                unsigned long ioaddr = netdev->base_addr;
-               priv->mac_type->ops->flow_ctrl(ioaddr, phy->duplex,
-                                              priv->flow_ctrl, priv->pause);
+               priv->hw->mac->flow_ctrl(ioaddr, phy->duplex,
+                                        priv->flow_ctrl, priv->pause);
        }
        spin_unlock(&priv->lock);
        return ret;
@@ -283,8 +284,8 @@ static void stmmac_get_ethtool_stats(struct net_device *dev,
        int i;
 
        /* Update HW stats if supported */
-       priv->mac_type->ops->dma_diagnostic_fr(&dev->stats, &priv->xstats,
-                                              ioaddr);
+       priv->hw->dma->dma_diagnostic_fr(&dev->stats, (void *) &priv->xstats,
+                                        ioaddr);
 
        for (i = 0; i < STMMAC_STATS_LEN; i++) {
                char *p = (char *)priv + stmmac_gstrings_stats[i].stat_offset;