[WATCHDOG] Documentation/watchdog/src/watchdog-simple.c: improve this code

[pandora-kernel.git] / drivers / net / mv643xx_eth.c

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 34df02c..84f2d63 100644 (file)
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1295,6 +1295,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
        struct ethtool_cmd cmd;
        int duplex = DUPLEX_HALF;
        int speed = 0;                  /* default to auto-negotiation */
+       DECLARE_MAC_BUF(mac);
 
        pd = pdev->dev.platform_data;
        if (pd == NULL) {
@@ -1413,8 +1414,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
 
        p = dev->dev_addr;
        printk(KERN_NOTICE
-               "%s: port %d with MAC address %02x:%02x:%02x:%02x:%02x:%02x\n",
-               dev->name, port_num, p[0], p[1], p[2], p[3], p[4], p[5]);
+               "%s: port %d with MAC address %s\n",
+               dev->name, port_num, print_mac(mac, p));
 
        if (dev->features & NETIF_F_SG)
                printk(KERN_NOTICE "%s: Scatter Gather Enabled\n", dev->name);
@@ -2673,9 +2674,14 @@ static void mv643xx_get_drvinfo(struct net_device *netdev,
        drvinfo->n_stats = MV643XX_STATS_LEN;
 }
 
-static int mv643xx_get_stats_count(struct net_device *netdev)
+static int mv643xx_get_sset_count(struct net_device *netdev, int sset)
 {
-       return MV643XX_STATS_LEN;
+       switch (sset) {
+       case ETH_SS_STATS:
+               return MV643XX_STATS_LEN;
+       default:
+               return -EOPNOTSUPP;
+       }
 }
 
 static void mv643xx_get_ethtool_stats(struct net_device *netdev,
@@ -2736,7 +2742,6 @@ static const struct ethtool_ops mv643xx_ethtool_ops = {
        .get_drvinfo            = mv643xx_get_drvinfo,
        .get_link               = mv643xx_eth_get_link,
        .set_sg                 = ethtool_op_set_sg,
-       .get_stats_count        = mv643xx_get_stats_count,
        .get_ethtool_stats      = mv643xx_get_ethtool_stats,
        .get_strings            = mv643xx_get_strings,
        .nway_reset             = mv643xx_eth_nway_restart,