aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath6kl
diff options
context:
space:
mode:
authorKalle Valo <kvalo@qca.qualcomm.com>2011-07-21 03:04:54 -0400
committerKalle Valo <kvalo@qca.qualcomm.com>2011-08-09 12:45:22 -0400
commitcf104c2a207f550d9c3b8f8bcf73cb11765692f6 (patch)
treed6c011e044a2cf5a85cdbad9ddf6476e4050cc5e /drivers/net/wireless/ath/ath6kl
parentb2c76bbe005cd23dfd80fe2140bd18daf4d3b16a (diff)
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 <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl')
-rw-r--r--drivers/net/wireless/ath/ath6kl/cfg80211.c3
1 files changed, 2 insertions, 1 deletions
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)
720 return (!((ch >= 2412) && (ch <= 2484))); 720 return (!((ch >= 2412) && (ch <= 2484)));
721} 721}
722 722
723/* struct ath6kl_node_table::nt_nodelock is locked when calling this */
723static void ath6kl_cfg80211_scan_node(void *arg, struct bss *ni) 724static void ath6kl_cfg80211_scan_node(void *arg, struct bss *ni)
724{ 725{
725 struct wiphy *wiphy = (struct wiphy *)arg; 726 struct wiphy *wiphy = (struct wiphy *)arg;
@@ -769,7 +770,7 @@ static void ath6kl_cfg80211_scan_node(void *arg, struct bss *ni)
769 "%s: bssid %pM ch %d freq %d size %d\n", __func__, 770 "%s: bssid %pM ch %d freq %d size %d\n", __func__,
770 mgmt->bssid, channel->hw_value, freq, size); 771 mgmt->bssid, channel->hw_value, freq, size);
771 cfg80211_inform_bss_frame(wiphy, channel, mgmt, 772 cfg80211_inform_bss_frame(wiphy, channel, mgmt,
772 size, signal, GFP_KERNEL); 773 size, signal, GFP_ATOMIC);
773 774
774 kfree(ieeemgmtbuf); 775 kfree(ieeemgmtbuf);
775} 776}