From ba8007ceb076f336a453a049cc5353eaa01d7136 Mon Sep 17 00:00:00 2001 From: Michael Wu Date: Sat, 13 Oct 2007 20:35:05 -0400 Subject: [PATCH] p54: Make filter configuration atomic p54_set_filter is now called from configure_filter, which is not allowed to sleep. The filter configuration packet allocation should be atomic now. Thanks to Dmitry Torokhov for reporting this bug. Signed-off-by: Michael Wu Signed-off-by: John W. Linville --- drivers/net/wireless/p54common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/p54common.c b/drivers/net/wireless/p54common.c index 2c63cf0ad2c..1437db0cf4b 100644 --- a/drivers/net/wireless/p54common.c +++ b/drivers/net/wireless/p54common.c @@ -577,7 +577,7 @@ static int p54_set_filter(struct ieee80211_hw *dev, u16 filter_type, struct p54_tx_control_filter *filter; hdr = kzalloc(sizeof(*hdr) + sizeof(*filter) + - priv->tx_hdr_len, GFP_KERNEL); + priv->tx_hdr_len, GFP_ATOMIC); if (!hdr) return -ENOMEM; -- cgit v1.2.3