---

yaml --- r: 71806 b: refs/heads/master c: ba8007c h: refs/heads/master v: v3
git-mirror · Oct 18, 2007 · 008992e · 008992e
1 parent 87d8f8c
commit 008992e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4771afb56930d6b03a04fa231f06ae29c3a496de
+refs/heads/master: ba8007ceb076f336a453a049cc5353eaa01d7136
diff --git a/trunk/drivers/net/wireless/p54common.c b/trunk/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;