From cf104c2a207f550d9c3b8f8bcf73cb11765692f6 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Thu, 21 Jul 2011 10:04:54 +0300 Subject: ath6kl: fix atomicity in ath6kl_cfg80211_scan_node() ath6kl_cfg80211_scan_node() was calling cfg80211_inform_bss_frame() with CFP_KERNEL but the function is executed with a spin lock taken. This is wrong and the function must use GFP_ATOMIC instead. Signed-off-by: Kalle Valo --- drivers/net/wireless/ath/ath6kl/cfg80211.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index b9090b876d45..eff99837819e 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -720,6 +720,7 @@ static inline bool is_ch_11a(u16 ch) return (!((ch >= 2412) && (ch <= 2484))); } +/* struct ath6kl_node_table::nt_nodelock is locked when calling this */ static void ath6kl_cfg80211_scan_node(void *arg, struct bss *ni) { struct wiphy *wiphy = (struct wiphy *)arg; @@ -769,7 +770,7 @@ static void ath6kl_cfg80211_scan_node(void *arg, struct bss *ni) "%s: bssid %pM ch %d freq %d size %d\n", __func__, mgmt->bssid, channel->hw_value, freq, size); cfg80211_inform_bss_frame(wiphy, channel, mgmt, - size, signal, GFP_KERNEL); + size, signal, GFP_ATOMIC); kfree(ieeemgmtbuf); } -- cgit v1.2.3-55-g7522