net: use netdev_mc_count and netdev_mc_empty when appropriate

[safe/jmp/linux-2.6] / drivers / net / arm / ixp4xx_eth.c

diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
index 87fde32..1a5f78b 100644 (file)
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@ -322,7 +322,7 @@ static int ixp4xx_mdio_write(struct mii_bus *bus, int phy_id, int location,
        ret = ixp4xx_mdio_cmd(bus, phy_id, location, 1, val);
        spin_unlock_irqrestore(&mdio_lock, flags);
 #if DEBUG_MDIO
-       printk(KERN_DEBUG "%s #%i: MII read [%i] <- 0x%X, err = %i\n",
+       printk(KERN_DEBUG "%s #%i: MII write [%i] <- 0x%X, err = %i\n",
               bus->name, phy_id, location, val, ret);
 #endif
        return ret;
@@ -737,7 +737,7 @@ static void eth_set_mcast_list(struct net_device *dev)
        struct port *port = netdev_priv(dev);
        struct dev_mc_list *mclist = dev->mc_list;
        u8 diffs[ETH_ALEN], *addr;
-       int cnt = dev->mc_count, i;
+       int cnt = netdev_mc_count(dev), i;
 
        if ((dev->flags & IFF_PROMISC) || !mclist || !cnt) {
                __raw_writel(DEFAULT_RX_CNTRL0 & ~RX_CNTRL0_ADDR_FLTR_EN,
@@ -802,7 +802,7 @@ static int ixp4xx_nway_reset(struct net_device *dev)
        return phy_start_aneg(port->phydev);
 }
 
-static struct ethtool_ops ixp4xx_ethtool_ops = {
+static const struct ethtool_ops ixp4xx_ethtool_ops = {
        .get_drvinfo = ixp4xx_get_drvinfo,
        .get_settings = ixp4xx_get_settings,
        .set_settings = ixp4xx_set_settings,
@@ -1142,6 +1142,7 @@ static const struct net_device_ops ixp4xx_netdev_ops = {
        .ndo_start_xmit = eth_xmit,
        .ndo_set_multicast_list = eth_set_mcast_list,
        .ndo_do_ioctl = eth_ioctl,
+       .ndo_change_mtu = eth_change_mtu,
        .ndo_set_mac_address = eth_mac_addr,
        .ndo_validate_addr = eth_validate_addr,
 };