chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: merge DNS and NTP entries when exporting
[elogind.git]
/
src
/
libsystemd-network
/
sd-dhcp6-client.c
diff --git
a/src/libsystemd-network/sd-dhcp6-client.c
b/src/libsystemd-network/sd-dhcp6-client.c
index 4f60578bc3184707767c2bbec0e7b11d6d2fdb31..13bed67ad31e32aa4e244b5c55fce2139eab0573 100644
(file)
--- a/
src/libsystemd-network/sd-dhcp6-client.c
+++ b/
src/libsystemd-network/sd-dhcp6-client.c
@@
-293,7
+293,6
@@
static int client_send_message(sd_dhcp6_client *client) {
break;
case DHCP6_STATE_STOPPED:
break;
case DHCP6_STATE_STOPPED:
- case DHCP6_STATE_RS:
case DHCP6_STATE_BOUND:
return -EINVAL;
}
case DHCP6_STATE_BOUND:
return -EINVAL;
}
@@
-446,7
+445,6
@@
static int client_timeout_resend(sd_event_source *s, uint64_t usec,
break;
case DHCP6_STATE_STOPPED:
break;
case DHCP6_STATE_STOPPED:
- case DHCP6_STATE_RS:
case DHCP6_STATE_BOUND:
return 0;
}
case DHCP6_STATE_BOUND:
return 0;
}
@@
-843,7
+841,6
@@
static int client_receive_message(sd_event_source *s, int fd, uint32_t revents,
break;
case DHCP6_STATE_STOPPED:
break;
case DHCP6_STATE_STOPPED:
- case DHCP6_STATE_RS:
return 0;
}
return 0;
}
@@
-874,7
+871,6
@@
static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
switch (state) {
case DHCP6_STATE_STOPPED:
switch (state) {
case DHCP6_STATE_STOPPED:
- case DHCP6_STATE_RS:
case DHCP6_STATE_SOLICITATION:
r = client_ensure_iaid(client);
case DHCP6_STATE_SOLICITATION:
r = client_ensure_iaid(client);