aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/r6040.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/r6040.c')
-rw-r--r--drivers/net/r6040.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 8b14c6eda7c3..f03e2e4a15a8 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -842,7 +842,7 @@ static int r6040_open(struct net_device *dev)
842 int ret; 842 int ret;
843 843
844 /* Request IRQ and Register interrupt handler */ 844 /* Request IRQ and Register interrupt handler */
845 ret = request_irq(dev->irq, &r6040_interrupt, 845 ret = request_irq(dev->irq, r6040_interrupt,
846 IRQF_SHARED, dev->name, dev); 846 IRQF_SHARED, dev->name, dev);
847 if (ret) 847 if (ret)
848 return ret; 848 return ret;
@@ -958,8 +958,7 @@ static void r6040_multicast_list(struct net_device *dev)
958 } 958 }
959 /* Too many multicast addresses 959 /* Too many multicast addresses
960 * accept all traffic */ 960 * accept all traffic */
961 else if ((dev->mc_count > MCAST_MAX) 961 else if ((dev->mc_count > MCAST_MAX) || (dev->flags & IFF_ALLMULTI))
962 || (dev->flags & IFF_ALLMULTI))
963 reg |= 0x0020; 962 reg |= 0x0020;
964 963
965 iowrite16(reg, ioaddr); 964 iowrite16(reg, ioaddr);