diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-07 05:10:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-07 05:10:27 -0400 |
| commit | 32bb93b02da8c75031e601ff1f9a25f99febbe5f (patch) | |
| tree | 429d2b978f517d366de572fa5058d513ed7b51a6 /drivers/net/lp486e.c | |
| parent | 6edafaaf6f5e70ef1e620ff01bd6bacebe1e0718 (diff) | |
| parent | 3859069bc3358772b08bd91efe9edec39a746ea8 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/lp486e.c')
| -rw-r--r-- | drivers/net/lp486e.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c index 591a7e4220c7..83fa9d82a004 100644 --- a/drivers/net/lp486e.c +++ b/drivers/net/lp486e.c | |||
| @@ -1272,8 +1272,6 @@ static void set_multicast_list(struct net_device *dev) { | |||
| 1272 | return; | 1272 | return; |
| 1273 | } | 1273 | } |
| 1274 | if (dev->mc_count == 0 && !(dev->flags & (IFF_PROMISC | IFF_ALLMULTI))) { | 1274 | if (dev->mc_count == 0 && !(dev->flags & (IFF_PROMISC | IFF_ALLMULTI))) { |
| 1275 | if (dev->flags & IFF_ALLMULTI) | ||
| 1276 | dev->flags |= IFF_PROMISC; | ||
| 1277 | lp->i596_config[8] &= ~0x01; | 1275 | lp->i596_config[8] &= ~0x01; |
| 1278 | } else { | 1276 | } else { |
| 1279 | lp->i596_config[8] |= 0x01; | 1277 | lp->i596_config[8] |= 0x01; |