lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] libertas: fix deadlock SIOCGIWSCAN handler

Browse Source 
Update signal quality before the locked scan result translation loop,
because calling libertas_prepare_and_send_command() with the
'waitforrsp' option grabs adapter->lock in the command return processing,
leading to the deadlock.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Dan Williams
2007-05-25 22:18:47 -04:00
committed by John W. Linville
parent 94b23855c0
commit 80e78ef74d
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/net/wireless/libertas/scan.c
View File

@@ -1506,7 +1506,6 @@ static inline char *libertas_translate_scan(wlan_private *priv,
char *current_val; /* For rates */ char *current_val; /* For rates */
struct iw_event iwe; /* Temporary buffer */ struct iw_event iwe; /* Temporary buffer */
int j; int j;
int ret;
#define PERFECT_RSSI ((u8)50) #define PERFECT_RSSI ((u8)50)
#define WORST_RSSI ((u8)0) #define WORST_RSSI ((u8)0)
#define RSSI_DIFF ((u8)(PERFECT_RSSI - WORST_RSSI)) #define RSSI_DIFF ((u8)(PERFECT_RSSI - WORST_RSSI))
@@ -1560,22 +1559,18 @@ static inline char *libertas_translate_scan(wlan_private *priv,
iwe.u.qual.noise = iwe.u.qual.noise =
CAL_NF(adapter->NF[TYPE_BEACON][TYPE_NOAVG]); CAL_NF(adapter->NF[TYPE_BEACON][TYPE_NOAVG]);
} }
if ((adapter->mode == IW_MODE_AUTO) &&
!libertas_SSID_cmp(&adapter->curbssparams.ssid, &bss->ssid)
&& adapter->adhoccreate) {
ret = libertas_prepare_and_send_command(priv,
cmd_802_11_rssi,
0,
cmd_option_waitforrsp,
0, NULL);
if (!ret) { /* Locally created ad-hoc BSSs won't have beacons if this is the
iwe.u.qual.level = * only station in the adhoc network; so get signal strength
CAL_RSSI(adapter->SNR[TYPE_RXPD][TYPE_AVG] / * from receive statistics.
AVG_SCALE, */
adapter->NF[TYPE_RXPD][TYPE_AVG] / if ((adapter->mode == IW_MODE_ADHOC)
AVG_SCALE); && adapter->adhoccreate
} && !libertas_SSID_cmp(&adapter->curbssparams.ssid, &bss->ssid)) {
int snr, nf;
snr = adapter->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE;
nf = adapter->NF[TYPE_RXPD][TYPE_AVG] / AVG_SCALE;
iwe.u.qual.level = CAL_RSSI(snr, nf);
} }
start = iwe_stream_add_event(start, stop, &iwe, IW_EV_QUAL_LEN); start = iwe_stream_add_event(start, stop, &iwe, IW_EV_QUAL_LEN);
@@ -1665,6 +1660,12 @@ int libertas_get_scan(struct net_device *dev, struct iw_request_info *info,
if (!adapter->nr_cmd_pending && adapter->last_scanned_channel) if (!adapter->nr_cmd_pending && adapter->last_scanned_channel)
wlan_scan_networks(priv, NULL, 0); wlan_scan_networks(priv, NULL, 0);
/* Update RSSI if current BSS is a locally created ad-hoc BSS */
if ((adapter->inframode == wlan802_11ibss) && adapter->adhoccreate) {
libertas_prepare_and_send_command(priv, cmd_802_11_rssi, 0,
cmd_option_waitforrsp, 0, NULL);
}
mutex_lock(&adapter->lock); mutex_lock(&adapter->lock);
list_for_each_entry_safe (iter_bss, safe, &adapter->network_list, list) { list_for_each_entry_safe (iter_bss, safe, &adapter->network_list, list) {
char * next_ev; char * next_ev;