diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2015-10-07 10:07:17 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-10-08 14:14:19 +0200 |
| commit | 90fb64024c5086601e6a1501a890890bc9b16499 (patch) | |
| tree | f76d5c616a94246509de64aad3351a48b3ceb85a /src/dhcp-manager | |
| parent | 68b3790ad36e4a140c43e96335e2be60ac935d76 (diff) | |
| parent | 8bfe99a1aeaabc552838f6d86770d54f9271ca1b (diff) | |
| download | NetworkManager-90fb64024c5086601e6a1501a890890bc9b16499.tar.gz | |
merge: merge branch 'systemd' into master
Diffstat (limited to 'src/dhcp-manager')
| -rw-r--r-- | src/dhcp-manager/nm-dhcp-systemd.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp-manager/nm-dhcp-systemd.c index 534b54f25b..4459fd583f 100644 --- a/src/dhcp-manager/nm-dhcp-systemd.c +++ b/src/dhcp-manager/nm-dhcp-systemd.c @@ -491,15 +491,15 @@ dhcp_event_cb (sd_dhcp_client *client, int event, gpointer user_data) nm_log_dbg (LOGD_DHCP4, "(%s): DHCPv4 client event %d", iface, event); switch (event) { - case DHCP_EVENT_EXPIRED: + case SD_DHCP_CLIENT_EVENT_EXPIRED: nm_dhcp_client_set_state (NM_DHCP_CLIENT (user_data), NM_DHCP_STATE_EXPIRE, NULL, NULL); break; - case DHCP_EVENT_STOP: + case SD_DHCP_CLIENT_EVENT_STOP: nm_dhcp_client_set_state (NM_DHCP_CLIENT (user_data), NM_DHCP_STATE_FAIL, NULL, NULL); break; - case DHCP_EVENT_RENEW: - case DHCP_EVENT_IP_CHANGE: - case DHCP_EVENT_IP_ACQUIRE: + case SD_DHCP_CLIENT_EVENT_RENEW: + case SD_DHCP_CLIENT_EVENT_IP_CHANGE: + case SD_DHCP_CLIENT_EVENT_IP_ACQUIRE: bound4_handle (self); break; default: @@ -671,14 +671,14 @@ dhcp6_event_cb (sd_dhcp6_client *client, int event, gpointer user_data) nm_log_dbg (LOGD_DHCP6, "(%s): DHCPv6 client event %d", iface, event); switch (event) { - case DHCP6_EVENT_RETRANS_MAX: + case SD_DHCP6_CLIENT_EVENT_RETRANS_MAX: nm_dhcp_client_set_state (NM_DHCP_CLIENT (user_data), NM_DHCP_STATE_TIMEOUT, NULL, NULL); break; - case DHCP6_EVENT_RESEND_EXPIRE: - case DHCP6_EVENT_STOP: + case SD_DHCP6_CLIENT_EVENT_RESEND_EXPIRE: + case SD_DHCP6_CLIENT_EVENT_STOP: nm_dhcp_client_set_state (NM_DHCP_CLIENT (user_data), NM_DHCP_STATE_FAIL, NULL, NULL); break; - case DHCP6_EVENT_IP_ACQUIRE: + case SD_DHCP6_CLIENT_EVENT_IP_ACQUIRE: bound6_handle (self); break; default: |