Commit ba8007ce authored Oct 13, 2007 by Michael Wu Committed by John W. Linville Oct 18, 2007

[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>

parent 4771afb5

drivers/net/wireless/p54common.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -577,7 +577,7 @@ static int p54_set_filter(struct ieee80211_hw *dev, u16 filter_type,
	struct p54_tx_control_filter *filter;		struct p54_tx_control_filter *filter;

	hdr = kzalloc(sizeof(hdr) + sizeof(filter) +		hdr = kzalloc(sizeof(hdr) + sizeof(filter) +
	priv->tx_hdr_len, GFP_KERNEL);		priv->tx_hdr_len, GFP_ATOMIC);
	if (!hdr)		if (!hdr)
	return -ENOMEM;		return -ENOMEM;