From: Michael Wu <flamingice@xxxxxxxxxxxx>
Some of the allocations made with GFP_ATOMIC really were necessary.
Signed-off-by: Michael Wu <flamingice@xxxxxxxxxxxx>
---
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;
-
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
