projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[cascardo/linux.git]
/
drivers
/
net
/
eth16i.c
diff --git
a/drivers/net/eth16i.c
b/drivers/net/eth16i.c
index
e3dd8b1
..
bee8b3f
100644
(file)
--- a/
drivers/net/eth16i.c
+++ b/
drivers/net/eth16i.c
@@
-1356,7
+1356,6
@@
static void eth16i_multicast(struct net_device *dev)
if(dev->mc_count || dev->flags&(IFF_ALLMULTI|IFF_PROMISC))
{
- dev->flags|=IFF_PROMISC; /* Must do this */
outb(3, ioaddr + RECEIVE_MODE_REG);
} else {
outb(2, ioaddr + RECEIVE_MODE_REG);