aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/7990.c
diff options
context:
space:
mode:
authorAndrea Bastoni <bastoni@cs.unc.edu>2010-05-30 19:16:45 -0400
committerAndrea Bastoni <bastoni@cs.unc.edu>2010-05-30 19:16:45 -0400
commitada47b5fe13d89735805b566185f4885f5a3f750 (patch)
tree644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/7990.c
parent43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff)
parent3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff)
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/7990.c')
-rw-r--r--drivers/net/7990.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/7990.c b/drivers/net/7990.c
index b1e5764628c6..500e135723bd 100644
--- a/drivers/net/7990.c
+++ b/drivers/net/7990.c
@@ -26,7 +26,6 @@
26#include <linux/ioport.h> 26#include <linux/ioport.h>
27#include <linux/in.h> 27#include <linux/in.h>
28#include <linux/route.h> 28#include <linux/route.h>
29#include <linux/slab.h>
30#include <linux/string.h> 29#include <linux/string.h>
31#include <linux/skbuff.h> 30#include <linux/skbuff.h>
32#include <asm/irq.h> 31#include <asm/irq.h>
@@ -595,9 +594,8 @@ static void lance_load_multicast (struct net_device *dev)
595 struct lance_private *lp = netdev_priv(dev); 594 struct lance_private *lp = netdev_priv(dev);
596 volatile struct lance_init_block *ib = lp->init_block; 595 volatile struct lance_init_block *ib = lp->init_block;
597 volatile u16 *mcast_table = (u16 *)&ib->filter; 596 volatile u16 *mcast_table = (u16 *)&ib->filter;
598 struct dev_mc_list *dmi=dev->mc_list; 597 struct dev_mc_list *dmi;
599 char *addrs; 598 char *addrs;
600 int i;
601 u32 crc; 599 u32 crc;
602 600
603 /* set all multicast bits */ 601 /* set all multicast bits */
@@ -611,9 +609,8 @@ static void lance_load_multicast (struct net_device *dev)
611 ib->filter [1] = 0; 609 ib->filter [1] = 0;
612 610
613 /* Add addresses */ 611 /* Add addresses */
614 for (i = 0; i < dev->mc_count; i++){ 612 netdev_for_each_mc_addr(dmi, dev) {
615 addrs = dmi->dmi_addr; 613 addrs = dmi->dmi_addr;
616 dmi = dmi->next;
617 614
618 /* multicast address? */ 615 /* multicast address? */
619 if (!(*addrs & 1)) 616 if (!(*addrs & 1))