1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index b124eee4eb10..474a4e3438db 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -908,8 +908,9 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id)
         istat = br32(bp, B44_ISTAT);
         imask = br32(bp, B44_IMASK);
 
-        /* ??? What the fuck is the purpose of the interrupt mask
-         * ??? register if we have to mask it out by hand anyways?
+        /* The interrupt mask register controls which interrupt bits
+         * will actually raise an interrupt to the CPU when set by hw/firmware,
+         * but doesn't mask off the bits.
          */
         istat &= imask;
         if (istat) {
@@ -1706,14 +1707,15 @@ static void __b44_set_rx_mode(struct net_device *dev)
 
                 __b44_set_mac_addr(bp);
 
-                if (dev->flags & IFF_ALLMULTI)
+                if ((dev->flags & IFF_ALLMULTI) ||
+                    (dev->mc_count > B44_MCAST_TABLE_SIZE))
                         val |= RXCONFIG_ALLMULTI;
                 else
                         i = __b44_load_mcast(bp, dev);
 
-                for (; i < 64; i++) {
+                for (; i < 64; i++)
                         __b44_cam_write(bp, zero, i);
-                }
+
                 bw32(bp, B44_RXCONFIG, val);
                 val = br32(bp, B44_CAM_CTRL);
                 bw32(bp, B44_CAM_CTRL, val | CAM_CTRL_ENABLE);
@@ -2055,7 +2057,7 @@ static int b44_read_eeprom(struct b44 *bp, u8 *data)
         u16 *ptr = (u16 *) data;
 
         for (i = 0; i < 128; i += 2)
-                ptr[i / 2] = readw(bp->regs + 4096 + i);
+                ptr[i / 2] = cpu_to_le16(readw(bp->regs + 4096 + i));
 
         return 0;
 }