wl1271: Fix multicast list handling
authorJuuso Oikarinen <juuso.oikarinen@nokia.com>
Tue, 13 Oct 2009 09:47:53 +0000 (12:47 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 27 Oct 2009 20:48:11 +0000 (16:48 -0400)
Fixes bugs in the multicast list handling:
 - Use atomic memory allocation in non-sleepable context
 - Increment address pointer when iterating list of MC addresses

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/wl12xx/wl1271_main.c

index ae41a70955086188f6590ae63beecde65a6d3ef9..19dbdb1b38abe5ecfbe42031a0813be30d3883bb 100644 (file)
@@ -1160,7 +1160,7 @@ static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw, int mc_count,
         * configure_filter() instead of saving everything in the context.
         */
 
-       fp = kzalloc(sizeof(*fp), GFP_KERNEL);
+       fp = kzalloc(sizeof(*fp), GFP_ATOMIC);
        if (!fp) {
                wl1271_error("Out of memory setting filters.");
                return 0;
@@ -1180,6 +1180,7 @@ static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw, int mc_count,
                        fp->mc_list_length++;
                } else
                        wl1271_warning("Unknown mc address length.");
+               mc_list = mc_list->next;
        }
 
        /* FIXME: We still need to set our filters properly */