Merge remote branch 'origin/btdun'

This commit is contained in:
Dan Williams
2010-02-18 10:18:20 -08:00
21 changed files with 2357 additions and 979 deletions

View File

@@ -366,6 +366,9 @@ typedef enum {
/* The supplicant is now available */
NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE,
/* The modem could not be found */
NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND,
/* Unused */
NM_DEVICE_STATE_REASON_LAST = 0xFFFF
} NMDeviceStateReason;