fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 06:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wimax: protect device add/remove with a mutex

Browse source 
Sometimes the add/remove code will get re-entered by the SDK because
the SDK is stupid.  Lock the code to ensure we don't double-detect
the same device.
This commit is contained in:
Dan Williams 2011-01-05 15:27:48 -06:00
parent bee33b9a26
commit a9918eefac
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/wimax/iwmxsdk.c
View file

@ -39,9 +39,7 @@
#include "iwmxsdk.h"
static WIMAX_API_DEVICE_ID g_api;
static int iwmx_sdk_setup(struct wmxsdk *wmxsdk);
static void iwmx_sdk_remove(struct wmxsdk *wmxsdk);
static GStaticMutex add_remove_mutex = G_STATIC_MUTEX_INIT;
/* Misc utilities */
#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
@ -1285,10 +1283,11 @@ static void iwmx_sdk_addremove_cb(WIMAX_API_DEVICE_ID *devid,
WIMAX_API_RET r;
WIMAX_API_HW_DEVICE_ID device_id_list[5];
UINT32 device_id_list_size = ARRAY_SIZE(device_id_list);
char errstr[512];
UINT32 errstr_size = sizeof(errstr);
g_static_mutex_lock(&add_remove_mutex);
nm_log_dbg(LOGD_WIMAX, "cb: handle %u index #%u is %d", devid->sdkHandle,
devid->deviceIndex, presence);
@ -1296,22 +1295,24 @@ static void iwmx_sdk_addremove_cb(WIMAX_API_DEVICE_ID *devid,
if (r != WIMAX_API_RET_SUCCESS) {
GetErrorString(devid, r, errstr, &errstr_size);
nm_log_err(LOGD_WIMAX, "wmxsdk: Cannot obtain list of devices: %d (%s)", r, errstr);
return;
goto out;
}
if (device_id_list_size == 0) {
nm_log_dbg(LOGD_WIMAX, "No WiMAX devices reported");
} else
} else {
for (cnt = 0; cnt < device_id_list_size; cnt++) {
WIMAX_API_HW_DEVICE_ID *dev =
device_id_list + cnt;
nm_log_dbg(LOGD_WIMAX, "#%u index #%u device %s", cnt,
dev->deviceIndex, dev->deviceName);
}
}
if (device_id_list_size < devid->deviceIndex) {
nm_log_err(LOGD_WIMAX, "wmxsdk: changed device (%u) not in the list? (%u items)",
devid->deviceIndex, device_id_list_size);
return;
goto out;
}
if (presence) {
@ -1322,6 +1323,9 @@ static void iwmx_sdk_addremove_cb(WIMAX_API_DEVICE_ID *devid,
} else {
iwmx_sdk_dev_rm(devid->deviceIndex);
}
out:
g_static_mutex_unlock(&add_remove_mutex);
}
/*