diff options
author | Michael Wu <flamingice@sourmilk.net> | 2007-10-13 20:35:05 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2007-10-18 15:44:42 -0400 |
commit | ba8007ceb076f336a453a049cc5353eaa01d7136 (patch) | |
tree | e46722b914f29d1994dd88eb657ab511bf74d376 /drivers/net | |
parent | 4771afb56930d6b03a04fa231f06ae29c3a496de (diff) |
[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 <dtor@insightbb.com> for reporting this bug.
Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/p54common.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |