summaryrefslogtreecommitdiff
path: root/libnm-glib/nm-device-wifi.c
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2011-03-17 13:39:09 -0500
committerDan Williams <dcbw@redhat.com>2011-03-17 13:42:22 -0500
commit14b23ba3991eb8e5f44330380fcae4d1940a8a2f (patch)
tree1d51bd1820fc42fea2986119260e2479cf8b4bca /libnm-glib/nm-device-wifi.c
parent8ae173635d16caca6d502b3a1104c6ee23aa7d3b (diff)
downloadNetworkManager-14b23ba3991eb8e5f44330380fcae4d1940a8a2f.tar.gz
libnm-glib: handle new device states
The device states aren't used yet, but handle them anyway.
Diffstat (limited to 'libnm-glib/nm-device-wifi.c')
-rw-r--r--libnm-glib/nm-device-wifi.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c
index 621c22f183..c58e70d3b0 100644
--- a/libnm-glib/nm-device-wifi.c
+++ b/libnm-glib/nm-device-wifi.c
@@ -209,15 +209,14 @@ nm_device_wifi_get_bitrate (NMDeviceWifi *device)
state = nm_device_get_state (NM_DEVICE (device));
switch (state) {
- case NM_DEVICE_STATE_PREPARE:
- case NM_DEVICE_STATE_CONFIG:
- case NM_DEVICE_STATE_NEED_AUTH:
case NM_DEVICE_STATE_IP_CONFIG:
+ case NM_DEVICE_STATE_IP_CHECK:
+ case NM_DEVICE_STATE_SECONDARIES:
case NM_DEVICE_STATE_ACTIVATED:
+ case NM_DEVICE_STATE_DEACTIVATING:
break;
default:
return 0;
- break;
}
priv = NM_DEVICE_WIFI_GET_PRIVATE (device);
@@ -281,7 +280,10 @@ nm_device_wifi_get_active_access_point (NMDeviceWifi *device)
case NM_DEVICE_STATE_CONFIG:
case NM_DEVICE_STATE_NEED_AUTH:
case NM_DEVICE_STATE_IP_CONFIG:
+ case NM_DEVICE_STATE_IP_CHECK:
+ case NM_DEVICE_STATE_SECONDARIES:
case NM_DEVICE_STATE_ACTIVATED:
+ case NM_DEVICE_STATE_DEACTIVATING:
break;
default:
return NULL;