From 728284320fbffd6990a903812f4809d73a07332a Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Thu, 21 Jul 2011 10:04:54 +0300 Subject: [PATCH] --- yaml --- r: 265472 b: refs/heads/master c: cf104c2a207f550d9c3b8f8bcf73cb11765692f6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4ec3d9fcefe8..a055c8fe69c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2c76bbe005cd23dfd80fe2140bd18daf4d3b16a +refs/heads/master: cf104c2a207f550d9c3b8f8bcf73cb11765692f6 diff --git a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c index b9090b876d45..eff99837819e 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/trunk/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); }