1 files changed, 10 insertions, 17 deletions

diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c
index 256119882b1e..56f66f485400 100644
--- a/drivers/net/lib8390.c
+++ b/drivers/net/lib8390.c
@@ -464,8 +464,8 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id)
                            ei_inb_p(e8390_base + EN0_ISR));
 
         /* !!Assumption!! -- we stay in page 0.  Don't break this. */
-        while ((interrupts = ei_inb_p(e8390_base + EN0_ISR)) != 0
-                   && ++nr_serviced < MAX_SERVICE)
+        while ((interrupts = ei_inb_p(e8390_base + EN0_ISR)) != 0 &&
+               ++nr_serviced < MAX_SERVICE)
         {
                 if (!netif_running(dev)) {
                         printk(KERN_WARNING "%s: interrupt from stopped card\n", dev->name);
@@ -721,10 +721,10 @@ static void ei_receive(struct net_device *dev)
                 /* Check for bogosity warned by 3c503 book: the status byte is never
                    written.  This happened a lot during testing! This code should be
                    cleaned up someday. */
-                if (rx_frame.next != next_frame
-                        && rx_frame.next != next_frame + 1
-                        && rx_frame.next != next_frame - num_rx_pages
-                        && rx_frame.next != next_frame + 1 - num_rx_pages) {
+                if (rx_frame.next != next_frame &&
+                    rx_frame.next != next_frame + 1 &&
+                    rx_frame.next != next_frame - num_rx_pages &&
+                    rx_frame.next != next_frame + 1 - num_rx_pages) {
                         ei_local->current_page = rxing_page;
                         ei_outb(ei_local->current_page-1, e8390_base+EN0_BOUNDARY);
                         dev->stats.rx_errors++;
@@ -907,15 +907,8 @@ static inline void make_mc_bits(u8 *bits, struct net_device *dev)
 {
         struct dev_mc_list *dmi;
 
-        for (dmi=dev->mc_list; dmi; dmi=dmi->next)
-        {
-                u32 crc;
-                if (dmi->dmi_addrlen != ETH_ALEN)
-                {
-                        printk(KERN_INFO "%s: invalid multicast address length given.\n", dev->name);
-                        continue;
-                }
-                crc = ether_crc(ETH_ALEN, dmi->dmi_addr);
+        netdev_for_each_mc_addr(dmi, dev) {
+                u32 crc = ether_crc(ETH_ALEN, dmi->dmi_addr);
                 /*
                  * The 8390 uses the 6 most significant bits of the
                  * CRC to index the multicast table.
@@ -941,7 +934,7 @@ static void do_set_multicast_list(struct net_device *dev)
         if (!(dev->flags&(IFF_PROMISC|IFF_ALLMULTI)))
         {
                 memset(ei_local->mcfilter, 0, 8);
-                if (dev->mc_list)
+                if (!netdev_mc_empty(dev))
                         make_mc_bits(ei_local->mcfilter, dev);
         }
         else
@@ -975,7 +968,7 @@ static void do_set_multicast_list(struct net_device *dev)
 
         if(dev->flags&IFF_PROMISC)
                 ei_outb_p(E8390_RXCONFIG | 0x18, e8390_base + EN0_RXCR);
-        else if(dev->flags&IFF_ALLMULTI || dev->mc_list)
+        else if (dev->flags & IFF_ALLMULTI || !netdev_mc_empty(dev))
                 ei_outb_p(E8390_RXCONFIG | 0x08, e8390_base + EN0_RXCR);
         else
                 ei_outb_p(E8390_RXCONFIG, e8390_base + EN0_RXCR);