Merge branch 'master' of github.com:davem330/net

[pandora-kernel.git] / drivers / net / ethernet / freescale / gianfar_ethtool.c

diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
similarity index 99%
rename from drivers/net/gianfar_ethtool.c
rename to drivers/net/ethernet/freescale/gianfar_ethtool.c
index 0caf3c3..212736b 100644 (file)
--- a/drivers/net/gianfar_ethtool.c
+++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
@@ -1676,6 +1676,7 @@ static int gfar_get_cls_all(struct gfar_private *priv,
        }
 
        cmd->data = MAX_FILER_IDX;
+       cmd->rule_cnt = i;
 
        return 0;
 }
@@ -1712,7 +1713,7 @@ static int gfar_set_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd)
 }
 
 static int gfar_get_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
-               void *rule_locs)
+               u32 *rule_locs)
 {
        struct gfar_private *priv = netdev_priv(dev);
        int ret = 0;
@@ -1728,7 +1729,7 @@ static int gfar_get_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
                ret = gfar_get_cls(priv, cmd);
                break;
        case ETHTOOL_GRXCLSRLALL:
-               ret = gfar_get_cls_all(priv, cmd, (u32 *) rule_locs);
+               ret = gfar_get_cls_all(priv, cmd, rule_locs);
                break;
        default:
                ret = -EINVAL;