net: usb: raw-ip: Fix autopm / system suspend issues.
[linux-2.6.git] / drivers / net / de620.c
index 55d2bb6..1c51a75 100644 (file)
@@ -464,7 +464,7 @@ static int de620_close(struct net_device *dev)
 
 static void de620_set_multicast_list(struct net_device *dev)
 {
-       if (dev->mc_count || dev->flags&(IFF_ALLMULTI|IFF_PROMISC))
+       if (!netdev_mc_empty(dev) || dev->flags&(IFF_ALLMULTI|IFF_PROMISC))
        { /* Enable promiscuous mode */
                de620_set_register(dev, W_TCR, (TCR_DEF & ~RXPBM) | RXALL);
        }
@@ -535,14 +535,13 @@ static int de620_start_xmit(struct sk_buff *skb, struct net_device *dev)
        }
        de620_write_block(dev, buffer, skb->len, len-skb->len);
 
-       dev->trans_start = jiffies;
        if(!(using_txbuf == (TXBF0 | TXBF1)))
                netif_wake_queue(dev);
 
        dev->stats.tx_packets++;
        spin_unlock_irqrestore(&de620_lock, flags);
        dev_kfree_skb (skb);
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 /*****************************************************
@@ -677,7 +676,7 @@ static int de620_rx_intr(struct net_device *dev)
        de620_set_register(dev, W_NPRF, next_rx_page);
        pr_debug("next_rx_page=%d CPR=%d\n", next_rx_page, curr_page);
 
-       return (next_rx_page != curr_page); /* That was slightly tricky... */
+       return next_rx_page != curr_page; /* That was slightly tricky... */
 }
 
 /*********************************************