linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mac80211: revert some GFP_ATOMIC -> GFP_KERNEL changes
@ 2007-07-26 17:53 Michael Wu
  2007-07-26 18:20 ` Andy Green
  0 siblings, 1 reply; 3+ messages in thread
From: Michael Wu @ 2007-07-26 17:53 UTC (permalink / raw)
  To: John Linville; +Cc: linux-wireless, Jiri Benc, andy

From: Michael Wu <flamingice@sourmilk.net>

Some of the allocations made with GFP_ATOMIC really were necessary.

Signed-off-by: Michael Wu <flamingice@sourmilk.net>
---

 net/mac80211/ieee80211_sta.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index 8296c0c..c9fc9a3 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -3911,7 +3911,7 @@ ieee80211_sta_scan_result(struct net_device *dev,
 
 	if (bss) {
 		char *buf;
-		buf = kmalloc(30, GFP_KERNEL);
+		buf = kmalloc(30, GFP_ATOMIC);
 		if (buf) {
 			memset(&iwe, 0, sizeof(iwe));
 			iwe.cmd = IWEVCUSTOM;
@@ -3929,7 +3929,7 @@ ieee80211_sta_scan_result(struct net_device *dev,
 		if (!(local->scan_flags & IEEE80211_SCAN_EXTRA_INFO))
 			break;
 
-		buf = kmalloc(100, GFP_KERNEL);
+		buf = kmalloc(100, GFP_ATOMIC);
 		if (!buf)
 			break;
 


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] mac80211: revert some GFP_ATOMIC -> GFP_KERNEL changes
  2007-07-26 17:53 [PATCH] mac80211: revert some GFP_ATOMIC -> GFP_KERNEL changes Michael Wu
@ 2007-07-26 18:20 ` Andy Green
  2007-07-26 20:58   ` Ulrich Kunitz
  0 siblings, 1 reply; 3+ messages in thread
From: Andy Green @ 2007-07-26 18:20 UTC (permalink / raw)
  To: Michael Wu; +Cc: John Linville, linux-wireless, Jiri Benc

Somebody in the thread at some point said:

> Some of the allocations made with GFP_ATOMIC really were necessary.

I tested it: this makes the BUG stuff in dmesg go away, thanks :-)

-Andy

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] mac80211: revert some GFP_ATOMIC -> GFP_KERNEL changes
  2007-07-26 18:20 ` Andy Green
@ 2007-07-26 20:58   ` Ulrich Kunitz
  0 siblings, 0 replies; 3+ messages in thread
From: Ulrich Kunitz @ 2007-07-26 20:58 UTC (permalink / raw)
  To: Andy Green; +Cc: Michael Wu, John Linville, linux-wireless, Jiri Benc

Andy Green wrote:

> Somebody in the thread at some point said:
> 
> > Some of the allocations made with GFP_ATOMIC really were necessary.
> 
> I tested it: this makes the BUG stuff in dmesg go away, thanks :-)

Confirmed, patch should definitely go into wireless-dev.

-- 
Uli Kunitz

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2007-07-26 20:58 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-26 17:53 [PATCH] mac80211: revert some GFP_ATOMIC -> GFP_KERNEL changes Michael Wu
2007-07-26 18:20 ` Andy Green
2007-07-26 20:58   ` Ulrich Kunitz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).