From d6a3e8e4959fbefae12de020257bba757a371580 Mon Sep 17 00:00:00 2001 From: Juuso Oikarinen Date: Tue, 13 Oct 2009 12:47:53 +0300 Subject: [PATCH] --- yaml --- r: 170976 b: refs/heads/master c: 7444113017b9d5394dc8c4bdf577f9567502417b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/wl1271_main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 67cd335c8777..8a66e1f1c587 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d07b668f28175a39e4ad06eccab75e8275266d1 +refs/heads/master: 7444113017b9d5394dc8c4bdf577f9567502417b diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c index ae41a7095508..19dbdb1b38ab 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c @@ -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 */