diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/sun3lance.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/sun3lance.c')
| -rw-r--r-- | drivers/net/sun3lance.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c index 0ca4241b4f63..1694ca5bfb41 100644 --- a/drivers/net/sun3lance.c +++ b/drivers/net/sun3lance.c | |||
| @@ -28,7 +28,6 @@ static char *version = "sun3lance.c: v1.2 1/12/2001 Sam Creasey (sammy@sammy.ne | |||
| 28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 29 | #include <linux/string.h> | 29 | #include <linux/string.h> |
| 30 | #include <linux/errno.h> | 30 | #include <linux/errno.h> |
| 31 | #include <linux/slab.h> | ||
| 32 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 34 | #include <linux/ioport.h> | 33 | #include <linux/ioport.h> |
| @@ -917,7 +916,7 @@ static void set_multicast_list( struct net_device *dev ) | |||
| 917 | REGA( CSR15 ) = 0x8000; /* Set promiscuous mode */ | 916 | REGA( CSR15 ) = 0x8000; /* Set promiscuous mode */ |
| 918 | } else { | 917 | } else { |
| 919 | short multicast_table[4]; | 918 | short multicast_table[4]; |
| 920 | int num_addrs = dev->mc_count; | 919 | int num_addrs = netdev_mc_count(dev); |
| 921 | int i; | 920 | int i; |
| 922 | /* We don't use the multicast table, but rely on upper-layer | 921 | /* We don't use the multicast table, but rely on upper-layer |
| 923 | * filtering. */ | 922 | * filtering. */ |