Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  eHEA: Fix bonding support
  Blackfin ethernet driver: on chip ethernet MAC controller driver
  fix wrong argument of tc35815_read_plat_dev_addr()
  ARM/ETHER3: Handle multicast frames.
  SAA9730: Handle multicast frames.
  NI5010: Handle multicast frames.
  NS83820: Handle multicast frames.
  Fix RGMII-ID handling in gianfar
  Fix Vitesse RGMII-ID support
  Add phy-connection-type to gianfar nodes
  Fix Vitesse 824x PHY interrupt acking
  [PATCH] zd1211rw: Add ID for Siemens Gigaset USB Stick 54
  [PATCH] zd1211rw: Add ID for Planex GW-US54GXS
  [PATCH] Update version ipw2200 stamp to 1.2.2
  [PATCH] ipw2200: Fix ipw_isr() comments error on shared IRQ
  [PATCH] Fix ipw2200 set wrong power parameter causing firmware error
  [PATCH] ipw2100: Fix `iwpriv set_power` error
  [PATCH] softmac: Channel is listed twice in scan output

1 files changed, 1 insertions, 5 deletions

diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c
index 3d5b4232f65f..22a3b3dc7d89 100644
--- a/drivers/net/ni5010.c
+++ b/drivers/net/ni5010.c
@@ -670,14 +670,10 @@ static void ni5010_set_multicast_list(struct net_device *dev)
 
         PRINTK2((KERN_DEBUG "%s: entering set_multicast_list\n", dev->name));
 
-        if (dev->flags&IFF_PROMISC || dev->flags&IFF_ALLMULTI) {
+        if (dev->flags&IFF_PROMISC || dev->flags&IFF_ALLMULTI || dev->mc_list) {
                 dev->flags |= IFF_PROMISC;
                 outb(RMD_PROMISC, EDLC_RMODE); /* Enable promiscuous mode */
                 PRINTK((KERN_DEBUG "%s: Entering promiscuous mode\n", dev->name));
-        } else if (dev->mc_list) {
-                /* Sorry, multicast not supported */
-                PRINTK((KERN_DEBUG "%s: No multicast, entering broadcast mode\n", dev->name));
-                outb(RMD_BROADCAST, EDLC_RMODE);
         } else {
                 PRINTK((KERN_DEBUG "%s: Entering broadcast mode\n", dev->name));
                 outb(RMD_BROADCAST, EDLC_RMODE);  /* Disable promiscuous mode, use normal mode */