projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
[cascardo/linux.git]
/
drivers
/
net
/
3c501.c
diff --git
a/drivers/net/3c501.c
b/drivers/net/3c501.c
index
4d4cad3
..
b6de7b1
100644
(file)
--- a/
drivers/net/3c501.c
+++ b/
drivers/net/3c501.c
@@
-812,7
+812,7
@@
static void set_multicast_list(struct net_device *dev)
if (dev->flags & IFF_PROMISC) {
outb(RX_PROM, RX_CMD);
inb(RX_STATUS);
if (dev->flags & IFF_PROMISC) {
outb(RX_PROM, RX_CMD);
inb(RX_STATUS);
- } else if (
dev->mc_list
|| dev->flags & IFF_ALLMULTI) {
+ } else if (
!netdev_mc_empty(dev)
|| dev->flags & IFF_ALLMULTI) {
/* Multicast or all multicast is the same */
outb(RX_MULT, RX_CMD);
inb(RX_STATUS); /* Clear status. */
/* Multicast or all multicast is the same */
outb(RX_MULT, RX_CMD);
inb(RX_STATUS); /* Clear status. */