ibmveth: Add suspend/resume support

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

diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c
index fd8cb50..8c4067a 100644 (file)
--- a/drivers/net/sc92031.c
+++ b/drivers/net/sc92031.c
@@ -429,17 +429,17 @@ static void _sc92031_set_mar(struct net_device *dev)
        u32 mar0 = 0, mar1 = 0;
 
        if ((dev->flags & IFF_PROMISC) ||
-           dev->mc_count > multicast_filter_limit ||
+           netdev_mc_count(dev) > multicast_filter_limit ||
            (dev->flags & IFF_ALLMULTI))
                mar0 = mar1 = 0xffffffff;
        else if (dev->flags & IFF_MULTICAST) {
-               struct dev_mc_list *mc_list;
+               struct netdev_hw_addr *ha;
 
-               for (mc_list = dev->mc_list; mc_list; mc_list = mc_list->next) {
+               netdev_for_each_mc_addr(ha, dev) {
                        u32 crc;
                        unsigned bit = 0;
 
-                       crc = ~ether_crc(ETH_ALEN, mc_list->dmi_addr);
+                       crc = ~ether_crc(ETH_ALEN, ha->addr);
                        crc >>= 24;
 
                        if (crc & 0x01) bit |= 0x02;
@@ -987,8 +987,6 @@ static netdev_tx_t sc92031_start_xmit(struct sk_buff *skb,
        iowrite32(tx_status, port_base + TxStatus0 + entry * 4);
        mmiowb();
 
-       dev->trans_start = jiffies;
-
        if (priv->tx_head - priv->tx_tail >= NUM_TX_DESC)
                netif_stop_queue(dev);