Skip to contentSkip to conversation

b44: fix multicast with >32 groups

PATCH In review Bill Helfinstine 3 participants 3 messages Sep 29, 2006 – Oct 5, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 b44: fix multicast with >32 groups

The b44 driver has a bug where if there are more than B44_MCAST_TABLE_SIZE groups in the dev->mc_list, it will only listen to the first B44_MCAST_TABLE_SIZE that it sees.

This patch makes the driver go into RXCONFIG_ALLMULTI mode if there are more than B44_MCAST_TABLE_SIZE groups being subscribed to.

This patch is against 2.6.18, b44.c version 1.01.

drivers/net/b44.c +2 -1
index e891ea2..dd024e1 100644
@@ -1706,7 +1706,8 @@ static void __b44_set_rx_mode(struct net
 
                __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);
#1 lore raw
Quoted 18 lines · Bill Helfinstine

The b44 driver has a bug where if there are more than B44_MCAST_TABLE_SIZE groups in the dev->mc_list, it will only listen to the first B44_MCAST_TABLE_SIZE that it sees.

This patch makes the driver go into RXCONFIG_ALLMULTI mode if there are more than B44_MCAST_TABLE_SIZE groups being subscribed to.

This patch is against 2.6.18, b44.c version 1.01.

drivers/net/b44.c +0 -0
index e891ea2..dd024e1 100644

drivers/net/b44.c static void __b44_set_rx_mode(struct net · line 1713

Quoted 9 lines
drivers/net/b44.c +2 -1
@@ -1706,7 +1706,8 @@ static void __b44_set_rx_mode(struct net
 
                 __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);

It looks good to me, however, I'll have to nack it as this patch has spaces and will not apply. Please convert the spaces to tabs.

Thanks,
Gary

#2 lore raw
In reply to Bill Helfinstine
Quoted 9 lines · Bill Helfinstine

The b44 driver has a bug where if there are more than B44_MCAST_TABLE_SIZE groups in the dev->mc_list, it will only listen to the first B44_MCAST_TABLE_SIZE that it sees.

This patch makes the driver go into RXCONFIG_ALLMULTI mode if there are more than B44_MCAST_TABLE_SIZE groups being subscribed to.

This patch is against 2.6.18, b44.c version 1.01.

applied manually, due to whitespace damage