fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-04 16:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wimax: handle device removal when the WiMAX Network Service goes away

Browse source 
There's some confusion in the code about indexes; there's the SDK index
from the NS, and there's the internal device index.  Of course we've
got to use the internal device index to remove it from our list, so we
need to convert the SDK index to an internal index before we can call
iwmx_sdk_dev_rm().

Second, the:

if (device_id_list_size < devid->deviceIndex) {

check is useless because by the time we get here, the device is already
gone from the SDK's device list, so this always triggers of the NS
quits.  So just run this check when devices get added to ensure the
NS isn't lying to us.  The, if we get a device removal event, match
up the SDK index with some internal device's SDK index and remove that.
This commit is contained in:
Dan Williams 2011-04-01 17:57:09 -05:00
parent 5fd3163a46
commit e20d64f76b
1 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/wimax/iwmxsdk.c
View file

@ -77,6 +77,18 @@ static struct wmxsdk *deviceid_to_wmxsdk(WIMAX_API_DEVICE_ID *device_id)
return NULL;
}
static int deviceid_to_index(WIMAX_API_DEVICE_ID *device_id)
{
unsigned cnt;
for (cnt = 0; cnt < IWMX_SDK_DEV_MAX; cnt++) {
struct wmxsdk *wmxsdk = g_iwmx_sdk_devs[cnt];
if (wmxsdk && wmxsdk->device_id.deviceIndex == device_id->deviceIndex)
return cnt;
}
return -1;
}
struct wmxsdk *iwmx_sdk_get_wmxsdk_for_iface(const char *iface)
{
unsigned cnt;
@ -1366,19 +1378,24 @@ static void iwmx_sdk_addremove_cb(WIMAX_API_DEVICE_ID *devid,
}
}
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);
goto out;
}
if (presence) {
WIMAX_API_HW_DEVICE_ID *dev =
device_id_list + devid->deviceIndex;
iwmx_sdk_dev_add(devid->deviceIndex, dev->deviceIndex,
dev->deviceName);
WIMAX_API_HW_DEVICE_ID *dev;
/* Make sure the wimax NS isn't lying to us */
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);
goto out;
}
/* Add the device to our internal list */
dev = device_id_list + devid->deviceIndex;
iwmx_sdk_dev_add(devid->deviceIndex, dev->deviceIndex, dev->deviceName);
} else {
iwmx_sdk_dev_rm(devid->deviceIndex);
/* Remove the device from our internal list */
cnt = deviceid_to_index(devid);
if (cnt >= 0)
iwmx_sdk_dev_rm(cnt);
}
out: