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 'linus' into x86/gart
[cascardo/linux.git]
/
drivers
/
net
/
lp486e.c
diff --git
a/drivers/net/lp486e.c
b/drivers/net/lp486e.c
index
591a7e4
..
83fa9d8
100644
(file)
--- a/
drivers/net/lp486e.c
+++ b/
drivers/net/lp486e.c
@@
-1272,8
+1272,6
@@
static void set_multicast_list(struct net_device *dev) {
return;
}
if (dev->mc_count == 0 && !(dev->flags & (IFF_PROMISC | IFF_ALLMULTI))) {
return;
}
if (dev->mc_count == 0 && !(dev->flags & (IFF_PROMISC | IFF_ALLMULTI))) {
- if (dev->flags & IFF_ALLMULTI)
- dev->flags |= IFF_PROMISC;
lp->i596_config[8] &= ~0x01;
} else {
lp->i596_config[8] |= 0x01;
lp->i596_config[8] &= ~0x01;
} else {
lp->i596_config[8] |= 0x01;