Index: uspace/srv/net/dhcp/dhcp.c
===================================================================
--- uspace/srv/net/dhcp/dhcp.c	(revision c1694b6b243b360b5f1fbf0629b5e7d4f7f4a515)
+++ uspace/srv/net/dhcp/dhcp.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -117,5 +117,5 @@
 
 /** Decode subnet mask into subnet prefix length. */
-static int subnet_mask_decode(uint32_t mask, int *bits)
+static errno_t subnet_mask_decode(uint32_t mask, int *bits)
 {
 	int zbits;
@@ -148,5 +148,5 @@
 }
 
-static int dhcp_send_discover(dhcp_link_t *dlink)
+static errno_t dhcp_send_discover(dhcp_link_t *dlink)
 {
 	dhcp_hdr_t *hdr = (dhcp_hdr_t *)msgbuf;
@@ -171,5 +171,5 @@
 }
 
-static int dhcp_send_request(dhcp_link_t *dlink, dhcp_offer_t *offer)
+static errno_t dhcp_send_request(dhcp_link_t *dlink, dhcp_offer_t *offer)
 {
 	dhcp_hdr_t *hdr = (dhcp_hdr_t *)msgbuf;
@@ -212,5 +212,5 @@
 }
 
-static int dhcp_parse_reply(void *msg, size_t size, dhcp_offer_t *offer)
+static errno_t dhcp_parse_reply(void *msg, size_t size, dhcp_offer_t *offer)
 {
 	dhcp_hdr_t *hdr = (dhcp_hdr_t *)msg;
@@ -225,5 +225,5 @@
 	uint8_t opt_type, opt_len;
 	uint8_t *msgb;
-	int rc;
+	errno_t rc;
 	size_t i;
 
@@ -360,7 +360,7 @@
 }
 
-static int dhcp_cfg_create(service_id_t iplink, dhcp_offer_t *offer)
-{
-	int rc;
+static errno_t dhcp_cfg_create(service_id_t iplink, dhcp_offer_t *offer)
+{
+	errno_t rc;
 	service_id_t addr_id;
 	service_id_t sroute_id;
@@ -420,9 +420,9 @@
 }
 
-static int dhcp_discover_proc(dhcp_link_t *dlink)
+static errno_t dhcp_discover_proc(dhcp_link_t *dlink)
 {
 	dlink->state = ds_selecting;
 
-	int rc = dhcp_send_discover(dlink);
+	errno_t rc = dhcp_send_discover(dlink);
 	if (rc != EOK)
 		return EIO;
@@ -438,8 +438,8 @@
 }
 
-int dhcpsrv_link_add(service_id_t link_id)
+errno_t dhcpsrv_link_add(service_id_t link_id)
 {
 	dhcp_link_t *dlink;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcpsrv_link_add(%zu)", link_id);
@@ -498,10 +498,10 @@
 }
 
-int dhcpsrv_link_remove(service_id_t link_id)
+errno_t dhcpsrv_link_remove(service_id_t link_id)
 {
 	return ENOTSUP;
 }
 
-int dhcpsrv_discover(service_id_t link_id)
+errno_t dhcpsrv_discover(service_id_t link_id)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcpsrv_link_add(%zu)", link_id);
@@ -520,5 +520,5 @@
 static void dhcpsrv_recv_offer(dhcp_link_t *dlink, dhcp_offer_t *offer)
 {
-	int rc;
+	errno_t rc;
 
 	if (dlink->state != ds_selecting) {
@@ -546,5 +546,5 @@
 static void dhcpsrv_recv_ack(dhcp_link_t *dlink, dhcp_offer_t *offer)
 {
-	int rc;
+	errno_t rc;
 
 	if (dlink->state != ds_requesting) {
@@ -572,5 +572,5 @@
 	dhcp_link_t *dlink = (dhcp_link_t *)arg;
 	dhcp_offer_t offer;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: dhcpsrv_recv() %zu bytes",
@@ -600,5 +600,5 @@
 {
 	dhcp_link_t *dlink = (dhcp_link_t *)arg;
-	int rc;
+	errno_t rc;
 
 	assert(dlink->state == ds_selecting);
@@ -628,5 +628,5 @@
 {
 	dhcp_link_t *dlink = (dhcp_link_t *)arg;
-	int rc;
+	errno_t rc;
 
 	assert(dlink->state == ds_requesting);