summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2014-07-22 17:18:14 -0500
committerTom Gundersen <teg@jklm.no>2014-07-23 09:19:47 +0200
commit6946f79d98430fccb1e0c947c135c807bc73a9c5 (patch)
treeebf01acc40d56776806e583e72e524766d943ca7 /src
parent28cc555d8504c9429776aedbbe1fee7101258578 (diff)
dhcp-network: remove unused DHCP6_STATE_RS
Probably a left-over from when router solicitations were requested in the DHCP6 code. But since they are now separate, this state is no longer needed.
Diffstat (limited to 'src')
-rw-r--r--src/libsystemd-network/dhcp6-protocol.h1
-rw-r--r--src/libsystemd-network/sd-dhcp6-client.c4
2 files changed, 0 insertions, 5 deletions
diff --git a/src/libsystemd-network/dhcp6-protocol.h b/src/libsystemd-network/dhcp6-protocol.h
index e9ae598b7a..eaa671711f 100644
--- a/src/libsystemd-network/dhcp6-protocol.h
+++ b/src/libsystemd-network/dhcp6-protocol.h
@@ -71,7 +71,6 @@ enum {
enum DHCP6State {
DHCP6_STATE_STOPPED = 0,
- DHCP6_STATE_RS = 1,
DHCP6_STATE_SOLICITATION = 2,
DHCP6_STATE_REQUEST = 3,
DHCP6_STATE_BOUND = 4,
diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index 4f60578bc3..13bed67ad3 100644
--- 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:
- case DHCP6_STATE_RS:
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:
- case DHCP6_STATE_RS:
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:
- case DHCP6_STATE_RS:
return 0;
}
@@ -874,7 +871,6 @@ static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
switch (state) {
case DHCP6_STATE_STOPPED:
- case DHCP6_STATE_RS:
case DHCP6_STATE_SOLICITATION:
r = client_ensure_iaid(client);