diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c index 642216460..194271a86 100644 --- a/clients/common/nm-client-utils.c +++ b/clients/common/nm-client-utils.c @@ -392,7 +392,8 @@ nmc_device_reason_to_string (NMDeviceStateReason reason) return _("OpenVSwitch database connection failed"); case NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE: return _("A duplicate IP address was detected"); - + case NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED: + return _("The selected IP method is not supported"); } /* TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason) */ diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h index 4c586d5d8..b2e448dfa 100644 --- a/libnm-core/nm-dbus-interface.h +++ b/libnm-core/nm-dbus-interface.h @@ -553,6 +553,7 @@ typedef enum { * @NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED: the device parent's management changed * @NM_DEVICE_STATE_REASON_OVSDB_FAILED: problem communicating with OpenVSwitch database * @NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE: a duplicate IP address was detected + * @NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED: The selected IP method is not supported * * Device state change reason codes */ @@ -622,6 +623,7 @@ typedef enum { NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED = 62, NM_DEVICE_STATE_REASON_OVSDB_FAILED = 63, NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE = 64, + NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED = 65, } NMDeviceStateReason; /** diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index b4a830fe9..8168957dd 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -656,6 +656,7 @@ NM_UTILS_LOOKUP_STR_DEFINE (nm_device_state_reason_to_str, NMDeviceStateReason, NM_UTILS_LOOKUP_STR_ITEM (NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED, "parent-managed-changed"), NM_UTILS_LOOKUP_STR_ITEM (NM_DEVICE_STATE_REASON_OVSDB_FAILED, "ovsdb-failed"), NM_UTILS_LOOKUP_STR_ITEM (NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE, "ip-address-duplicate"), + NM_UTILS_LOOKUP_STR_ITEM (NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED, "ip-method-unsupported"), ); #define reason_to_string(reason) \ diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index 1c32791f1..010a2b604 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -685,9 +685,8 @@ nm_modem_stage3_ip4_config_start (NMModem *self, return NM_ACT_STAGE_RETURN_SUCCESS; if (strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) != 0) { - _LOGW ("unhandled WWAN IPv4 method '%s'; will fail", - method); - NM_SET_OUT (out_failure_reason, NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE); + _LOGE ("unhandled WWAN IPv4 method '%s'; will fail", method); + NM_SET_OUT (out_failure_reason, NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED); return NM_ACT_STAGE_RETURN_FAILURE; }