diff options
| author | Kalle Valo | 2011-07-21 09:04:54 +0200 |
|---|---|---|
| committer | Kalle Valo | 2011-08-09 18:45:22 +0200 |
| commit | cf104c2a207f550d9c3b8f8bcf73cb11765692f6 (patch) | |
| tree | d6c011e044a2cf5a85cdbad9ddf6476e4050cc5e | |
| parent | ath6kl: don't force foreground scan when connected (diff) | |
| download | kernel-qcow2-linux-cf104c2a207f550d9c3b8f8bcf73cb11765692f6.tar.gz kernel-qcow2-linux-cf104c2a207f550d9c3b8f8bcf73cb11765692f6.tar.xz kernel-qcow2-linux-cf104c2a207f550d9c3b8f8bcf73cb11765692f6.zip | |
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>
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.c | 3 |
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) 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); } |