Index: uspace/srv/net/dhcp/dhcp.c
===================================================================
--- uspace/srv/net/dhcp/dhcp.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/dhcp/dhcp.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -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);
Index: uspace/srv/net/dhcp/dhcp.h
===================================================================
--- uspace/srv/net/dhcp/dhcp.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/dhcp/dhcp.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -41,7 +41,7 @@
 
 extern void dhcpsrv_links_init(void);
-extern int dhcpsrv_link_add(service_id_t);
-extern int dhcpsrv_link_remove(service_id_t);
-extern int dhcpsrv_discover(service_id_t);
+extern errno_t dhcpsrv_link_add(service_id_t);
+extern errno_t dhcpsrv_link_remove(service_id_t);
+extern errno_t dhcpsrv_discover(service_id_t);
 
 #endif
Index: uspace/srv/net/dhcp/main.c
===================================================================
--- uspace/srv/net/dhcp/main.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/dhcp/main.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -52,7 +52,7 @@
 static void dhcp_client_conn(ipc_callid_t, ipc_call_t *, void *);
 
-static int dhcp_init(void)
+static errno_t dhcp_init(void)
 {
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcp_init()");
@@ -87,5 +87,5 @@
 {
 	sysarg_t link_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcp_link_add_srv()");
@@ -100,5 +100,5 @@
 {
 	sysarg_t link_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcp_link_remove_srv()");
@@ -113,5 +113,5 @@
 {
 	sysarg_t link_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcp_discover_srv()");
@@ -159,5 +159,5 @@
 int main(int argc, char *argv[])
 {
-	int rc;
+	errno_t rc;
 
 	printf("%s: DHCP Service\n", NAME);
Index: uspace/srv/net/dhcp/transport.c
===================================================================
--- uspace/srv/net/dhcp/transport.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/dhcp/transport.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -75,8 +75,8 @@
 };
 
-int dhcp_send(dhcp_transport_t *dt, void *msg, size_t size)
+errno_t dhcp_send(dhcp_transport_t *dt, void *msg, size_t size)
 {
 	inet_ep_t ep;
-	int rc;
+	errno_t rc;
 
 	inet_ep_init(&ep);
@@ -97,5 +97,5 @@
 	dhcp_transport_t *dt;
 	size_t s;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_NOTE, "dhcp_recv_msg()");
@@ -126,5 +126,5 @@
 }
 
-int dhcp_transport_init(dhcp_transport_t *dt, service_id_t link_id,
+errno_t dhcp_transport_init(dhcp_transport_t *dt, service_id_t link_id,
     dhcp_recv_cb_t recv_cb, void *arg)
 {
@@ -132,5 +132,5 @@
 	udp_assoc_t *assoc = NULL;
 	inet_ep2_t epp;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcp_transport_init()");
Index: uspace/srv/net/dhcp/transport.h
===================================================================
--- uspace/srv/net/dhcp/transport.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/dhcp/transport.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -58,8 +58,8 @@
 };
 
-extern int dhcp_transport_init(dhcp_transport_t *, service_id_t,
+extern errno_t dhcp_transport_init(dhcp_transport_t *, service_id_t,
     dhcp_recv_cb_t, void *);
 extern void dhcp_transport_fini(dhcp_transport_t *);
-extern int dhcp_send(dhcp_transport_t *dt, void *msg, size_t size);
+extern errno_t dhcp_send(dhcp_transport_t *dt, void *msg, size_t size);
 
 #endif
Index: uspace/srv/net/dnsrsrv/dns_msg.c
===================================================================
--- uspace/srv/net/dnsrsrv/dns_msg.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/dnsrsrv/dns_msg.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -56,5 +56,5 @@
  * fit in and append @a suff.
  */
-static int dns_dstr_ext(char **dstr, const char *suff)
+static errno_t dns_dstr_ext(char **dstr, const char *suff)
 {
 	size_t s1, s2;
@@ -93,5 +93,5 @@
  * @param act_size	Place to store actual encoded size
  */
-static int dns_name_encode(char *name, uint8_t *buf, size_t buf_size,
+static errno_t dns_name_encode(char *name, uint8_t *buf, size_t buf_size,
     size_t *act_size)
 {
@@ -158,5 +158,5 @@
  * @param eoff	Place to store end offset (offset after last decoded byte)
  */
-int dns_name_decode(dns_pdu_t *pdu, size_t boff, char **rname,
+errno_t dns_name_decode(dns_pdu_t *pdu, size_t boff, char **rname,
     size_t *eoff)
 {
@@ -169,5 +169,5 @@
 	char *name;
 	char dbuf[2];
-	int rc;
+	errno_t rc;
 	bool first;
 
@@ -325,10 +325,10 @@
  * @param act_size	Place to store actual encoded size
  */
-static int dns_question_encode(dns_question_t *question, uint8_t *buf,
+static errno_t dns_question_encode(dns_question_t *question, uint8_t *buf,
     size_t buf_size, size_t *act_size)
 {
 	size_t name_size;
 	size_t di;
-	int rc;
+	errno_t rc;
 
 	rc = dns_name_encode(question->qname, buf, buf_size, &name_size);
@@ -358,10 +358,10 @@
  * @param eoff		Place to store end offset (offset after last decoded byte)
  */
-static int dns_question_decode(dns_pdu_t *pdu, size_t boff,
+static errno_t dns_question_decode(dns_pdu_t *pdu, size_t boff,
     dns_question_t **rquestion, size_t *eoff)
 {
 	dns_question_t *question;
 	size_t name_eoff;
-	int rc;
+	errno_t rc;
 
 	question = calloc(1, sizeof (dns_question_t));
@@ -398,5 +398,5 @@
  * @param eoff		Place to store end offset (offset after last decoded byte)
  */
-static int dns_rr_decode(dns_pdu_t *pdu, size_t boff, dns_rr_t **retrr,
+static errno_t dns_rr_decode(dns_pdu_t *pdu, size_t boff, dns_rr_t **retrr,
     size_t *eoff)
 {
@@ -406,5 +406,5 @@
 	size_t bsz;
 	size_t rdlength;
-	int rc;
+	errno_t rc;
 
 	rr = calloc(1, sizeof(dns_rr_t));
@@ -492,5 +492,5 @@
  *		ENOMEM if out of memory
  */
-int dns_message_encode(dns_message_t *msg, void **rdata, size_t *rsize)
+errno_t dns_message_encode(dns_message_t *msg, void **rdata, size_t *rsize)
 {
 	uint8_t *data;
@@ -499,5 +499,5 @@
 	size_t q_size = 0;
 	size_t di;
-	int rc;
+	errno_t rc;
 
 	hdr.id = host2uint16_t_be(msg->id);
@@ -564,5 +564,5 @@
  * 		ENOMEM if out of memory
  */
-int dns_message_decode(void *data, size_t size, dns_message_t **rmsg)
+errno_t dns_message_decode(void *data, size_t size, dns_message_t **rmsg)
 {
 	dns_message_t *msg;
@@ -575,5 +575,5 @@
 	size_t an_count;
 	size_t i;
-	int rc;
+	errno_t rc;
 
 	msg = dns_message_new();
Index: uspace/srv/net/dnsrsrv/dns_msg.h
===================================================================
--- uspace/srv/net/dnsrsrv/dns_msg.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/dnsrsrv/dns_msg.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -44,9 +44,9 @@
 #include "dns_type.h"
 
-extern int dns_message_encode(dns_message_t *, void **, size_t *);
-extern int dns_message_decode(void *, size_t, dns_message_t **);
+extern errno_t dns_message_encode(dns_message_t *, void **, size_t *);
+extern errno_t dns_message_decode(void *, size_t, dns_message_t **);
 extern dns_message_t *dns_message_new(void);
 extern void dns_message_destroy(dns_message_t *);
-extern int dns_name_decode(dns_pdu_t *, size_t, char **, size_t *);
+extern errno_t dns_name_decode(dns_pdu_t *, size_t, char **, size_t *);
 extern uint32_t dns_uint32_t_decode(uint8_t *, size_t);
 extern void dns_addr128_t_decode(uint8_t *, size_t, addr128_t);
Index: uspace/srv/net/dnsrsrv/dnsrsrv.c
===================================================================
--- uspace/srv/net/dnsrsrv/dnsrsrv.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/dnsrsrv/dnsrsrv.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -54,7 +54,7 @@
 static void dnsr_client_conn(ipc_callid_t, ipc_call_t *, void *);
 
-static int dnsr_init(void)
-{
-	int rc;
+static errno_t dnsr_init(void)
+{
+	errno_t rc;
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "dnsr_init()");
 
@@ -93,5 +93,5 @@
 	
 	char *name;
-	int rc = async_data_write_accept((void **) &name, true, 0,
+	errno_t rc = async_data_write_accept((void **) &name, true, 0,
 	    DNS_NAME_MAX_SIZE, 0, NULL);
 	if (rc != EOK) {
@@ -171,5 +171,5 @@
 	// FIXME locking
 	
-	int rc = async_data_read_finalize(callid, &dns_server_addr, size);
+	errno_t rc = async_data_read_finalize(callid, &dns_server_addr, size);
 	if (rc != EOK)
 		async_answer_0(callid, rc);
@@ -199,5 +199,5 @@
 	// FIXME locking
 	
-	int rc = async_data_write_finalize(callid, &dns_server_addr, size);
+	errno_t rc = async_data_write_finalize(callid, &dns_server_addr, size);
 	if (rc != EOK) {
 		async_answer_0(callid, rc);
@@ -246,5 +246,5 @@
 int main(int argc, char *argv[])
 {
-	int rc;
+	errno_t rc;
 
 	printf("%s: DNS Resolution Service\n", NAME);
Index: uspace/srv/net/dnsrsrv/query.c
===================================================================
--- uspace/srv/net/dnsrsrv/query.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/dnsrsrv/query.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -47,5 +47,5 @@
 static uint16_t msg_id;
 
-static int dns_name_query(const char *name, dns_qtype_t qtype,
+static errno_t dns_name_query(const char *name, dns_qtype_t qtype,
     dns_host_info_t *info)
 {
@@ -92,5 +92,5 @@
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "dns_name_query: send DNS request");
 	dns_message_t *amsg;
-	int rc = dns_request(msg, &amsg);
+	errno_t rc = dns_request(msg, &amsg);
 	if (rc != EOK) {
 		dns_message_destroy(msg);
@@ -190,5 +190,5 @@
 }
 
-int dns_name2host(const char *name, dns_host_info_t **rinfo, ip_ver_t ver)
+errno_t dns_name2host(const char *name, dns_host_info_t **rinfo, ip_ver_t ver)
 {
 	dns_host_info_t *info = calloc(1, sizeof(dns_host_info_t));
@@ -196,5 +196,5 @@
 		return ENOMEM;
 	
-	int rc;
+	errno_t rc;
 	
 	switch (ver) {
Index: uspace/srv/net/dnsrsrv/query.h
===================================================================
--- uspace/srv/net/dnsrsrv/query.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/dnsrsrv/query.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -40,5 +40,5 @@
 #include "dns_type.h"
 
-extern int dns_name2host(const char *, dns_host_info_t **, ip_ver_t);
+extern errno_t dns_name2host(const char *, dns_host_info_t **, ip_ver_t);
 extern void dns_hostinfo_destroy(dns_host_info_t *);
 
Index: uspace/srv/net/dnsrsrv/transport.c
===================================================================
--- uspace/srv/net/dnsrsrv/transport.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/dnsrsrv/transport.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -69,5 +69,5 @@
 	fibril_mutex_t done_lock;
 
-	int status;
+	errno_t status;
 } trans_req_t;
 
@@ -90,8 +90,8 @@
 };
 
-int transport_init(void)
+errno_t transport_init(void)
 {
 	inet_ep2_t epp;
-	int rc;
+	errno_t rc;
 
 	inet_ep2_init(&epp);
@@ -177,5 +177,5 @@
 }
 
-int dns_request(dns_message_t *req, dns_message_t **rresp)
+errno_t dns_request(dns_message_t *req, dns_message_t **rresp)
 {
 	trans_req_t *treq = NULL;
@@ -185,5 +185,5 @@
 	size_t req_size;
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "dns_request: Encode dns message");
-	int rc = dns_message_encode(req, &req_data, &req_size);
+	errno_t rc = dns_message_encode(req, &req_data, &req_size);
 	if (rc != EOK)
 		goto error;
@@ -255,5 +255,5 @@
 	size_t size;
 	inet_ep_t remote_ep;
-	int rc;
+	errno_t rc;
 
 	size = udp_rmsg_size(rmsg);
Index: uspace/srv/net/dnsrsrv/transport.h
===================================================================
--- uspace/srv/net/dnsrsrv/transport.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/dnsrsrv/transport.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -42,7 +42,7 @@
 extern inet_addr_t dns_server_addr;
 
-extern int transport_init(void);
+extern errno_t transport_init(void);
 extern void transport_fini(void);
-extern int dns_request(dns_message_t *, dns_message_t **);
+extern errno_t dns_request(dns_message_t *, dns_message_t **);
 
 #endif
Index: uspace/srv/net/ethip/arp.c
===================================================================
--- uspace/srv/net/ethip/arp.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/ethip/arp.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -50,5 +50,5 @@
 #define ARP_REQUEST_TIMEOUT (3 * 1000 * 1000)
 
-static int arp_send_packet(ethip_nic_t *nic, arp_eth_packet_t *packet);
+static errno_t arp_send_packet(ethip_nic_t *nic, arp_eth_packet_t *packet);
 
 void arp_received(ethip_nic_t *nic, eth_frame_t *frame)
@@ -57,5 +57,5 @@
 	
 	arp_eth_packet_t packet;
-	int rc = arp_pdu_decode(frame->data, frame->size, &packet);
+	errno_t rc = arp_pdu_decode(frame->data, frame->size, &packet);
 	if (rc != EOK)
 		return;
@@ -94,5 +94,5 @@
 }
 
-int arp_translate(ethip_nic_t *nic, addr32_t src_addr, addr32_t ip_addr,
+errno_t arp_translate(ethip_nic_t *nic, addr32_t src_addr, addr32_t ip_addr,
     addr48_t mac_addr)
 {
@@ -103,5 +103,5 @@
 	}
 
-	int rc = atrans_lookup(ip_addr, mac_addr);
+	errno_t rc = atrans_lookup(ip_addr, mac_addr);
 	if (rc == EOK)
 		return EOK;
@@ -122,7 +122,7 @@
 }
 
-static int arp_send_packet(ethip_nic_t *nic, arp_eth_packet_t *packet)
+static errno_t arp_send_packet(ethip_nic_t *nic, arp_eth_packet_t *packet)
 {
-	int rc;
+	errno_t rc;
 	void *pdata;
 	size_t psize;
Index: uspace/srv/net/ethip/arp.h
===================================================================
--- uspace/srv/net/ethip/arp.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/ethip/arp.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -43,5 +43,5 @@
 
 extern void arp_received(ethip_nic_t *, eth_frame_t *);
-extern int arp_translate(ethip_nic_t *, addr32_t, addr32_t, addr48_t);
+extern errno_t arp_translate(ethip_nic_t *, addr32_t, addr32_t, addr48_t);
 
 #endif
Index: uspace/srv/net/ethip/atrans.c
===================================================================
--- uspace/srv/net/ethip/atrans.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/ethip/atrans.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -59,5 +59,5 @@
 }
 
-int atrans_add(addr32_t ip_addr, addr48_t mac_addr)
+errno_t atrans_add(addr32_t ip_addr, addr48_t mac_addr)
 {
 	ethip_atrans_t *atrans;
@@ -85,5 +85,5 @@
 }
 
-int atrans_remove(addr32_t ip_addr)
+errno_t atrans_remove(addr32_t ip_addr)
 {
 	ethip_atrans_t *atrans;
@@ -103,5 +103,5 @@
 }
 
-static int atrans_lookup_locked(addr32_t ip_addr, addr48_t mac_addr)
+static errno_t atrans_lookup_locked(addr32_t ip_addr, addr48_t mac_addr)
 {
 	ethip_atrans_t *atrans = atrans_find(ip_addr);
@@ -113,7 +113,7 @@
 }
 
-int atrans_lookup(addr32_t ip_addr, addr48_t mac_addr)
+errno_t atrans_lookup(addr32_t ip_addr, addr48_t mac_addr)
 {
-	int rc;
+	errno_t rc;
 
 	fibril_mutex_lock(&atrans_list_lock);
@@ -134,10 +134,10 @@
 }
 
-int atrans_lookup_timeout(addr32_t ip_addr, suseconds_t timeout,
+errno_t atrans_lookup_timeout(addr32_t ip_addr, suseconds_t timeout,
     addr48_t mac_addr)
 {
 	fibril_timer_t *t;
 	bool timedout;
-	int rc;
+	errno_t rc;
 
 	t = fibril_timer_create(NULL);
Index: uspace/srv/net/ethip/atrans.h
===================================================================
--- uspace/srv/net/ethip/atrans.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/ethip/atrans.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -42,8 +42,8 @@
 #include "ethip.h"
 
-extern int atrans_add(addr32_t, addr48_t);
-extern int atrans_remove(addr32_t);
-extern int atrans_lookup(addr32_t, addr48_t);
-extern int atrans_lookup_timeout(addr32_t, suseconds_t, addr48_t);
+extern errno_t atrans_add(addr32_t, addr48_t);
+extern errno_t atrans_remove(addr32_t);
+extern errno_t atrans_lookup(addr32_t, addr48_t);
+extern errno_t atrans_lookup_timeout(addr32_t, suseconds_t, addr48_t);
 
 #endif
Index: uspace/srv/net/ethip/ethip.c
===================================================================
--- uspace/srv/net/ethip/ethip.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/ethip/ethip.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -53,13 +53,13 @@
 #define NAME "ethip"
 
-static int ethip_open(iplink_srv_t *srv);
-static int ethip_close(iplink_srv_t *srv);
-static int ethip_send(iplink_srv_t *srv, iplink_sdu_t *sdu);
-static int ethip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu);
-static int ethip_get_mtu(iplink_srv_t *srv, size_t *mtu);
-static int ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac);
-static int ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac);
-static int ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr);
-static int ethip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
+static errno_t ethip_open(iplink_srv_t *srv);
+static errno_t ethip_close(iplink_srv_t *srv);
+static errno_t ethip_send(iplink_srv_t *srv, iplink_sdu_t *sdu);
+static errno_t ethip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu);
+static errno_t ethip_get_mtu(iplink_srv_t *srv, size_t *mtu);
+static errno_t ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac);
+static errno_t ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac);
+static errno_t ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr);
+static errno_t ethip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
 
 static void ethip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -77,9 +77,9 @@
 };
 
-static int ethip_init(void)
+static errno_t ethip_init(void)
 {
 	async_set_fallback_port_handler(ethip_client_conn, NULL);
 	
-	int rc = loc_server_register(NAME);
+	errno_t rc = loc_server_register(NAME);
 	if (rc != EOK) {
 		log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server.");
@@ -94,7 +94,7 @@
 }
 
-int ethip_iplink_init(ethip_nic_t *nic)
-{
-	int rc;
+errno_t ethip_iplink_init(ethip_nic_t *nic)
+{
+	errno_t rc;
 	service_id_t sid;
 	category_id_t iplink_cat;
@@ -158,5 +158,5 @@
 }
 
-static int ethip_open(iplink_srv_t *srv)
+static errno_t ethip_open(iplink_srv_t *srv)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_open()");
@@ -164,5 +164,5 @@
 }
 
-static int ethip_close(iplink_srv_t *srv)
+static errno_t ethip_close(iplink_srv_t *srv)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_close()");
@@ -170,5 +170,5 @@
 }
 
-static int ethip_send(iplink_srv_t *srv, iplink_sdu_t *sdu)
+static errno_t ethip_send(iplink_srv_t *srv, iplink_sdu_t *sdu)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_send()");
@@ -177,5 +177,5 @@
 	eth_frame_t frame;
 	
-	int rc = arp_translate(nic, sdu->src, sdu->dest, frame.dest);
+	errno_t rc = arp_translate(nic, sdu->src, sdu->dest, frame.dest);
 	if (rc != EOK) {
 		log_msg(LOG_DEFAULT, LVL_WARN, "Failed to look up IPv4 address 0x%"
@@ -201,5 +201,5 @@
 }
 
-static int ethip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu)
+static errno_t ethip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_send6()");
@@ -216,5 +216,5 @@
 	void *data;
 	size_t size;
-	int rc = eth_pdu_encode(&frame, &data, &size);
+	errno_t rc = eth_pdu_encode(&frame, &data, &size);
 	if (rc != EOK)
 		return rc;
@@ -226,5 +226,5 @@
 }
 
-int ethip_received(iplink_srv_t *srv, void *data, size_t size)
+errno_t ethip_received(iplink_srv_t *srv, void *data, size_t size)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_received(): srv=%p", srv);
@@ -234,5 +234,5 @@
 	
 	eth_frame_t frame;
-	int rc = eth_pdu_decode(data, size, &frame);
+	errno_t rc = eth_pdu_decode(data, size, &frame);
 	if (rc != EOK) {
 		log_msg(LOG_DEFAULT, LVL_DEBUG, " - eth_pdu_decode failed");
@@ -269,5 +269,5 @@
 }
 
-static int ethip_get_mtu(iplink_srv_t *srv, size_t *mtu)
+static errno_t ethip_get_mtu(iplink_srv_t *srv, size_t *mtu)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_get_mtu()");
@@ -276,5 +276,5 @@
 }
 
-static int ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac)
+static errno_t ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_get_mac48()");
@@ -286,5 +286,5 @@
 }
 
-static int ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac)
+static errno_t ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_set_mac48()");
@@ -296,5 +296,5 @@
 }
 
-static int ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr)
+static errno_t ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr)
 {
 	ethip_nic_t *nic = (ethip_nic_t *) srv->arg;
@@ -303,5 +303,5 @@
 }
 
-static int ethip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr)
+static errno_t ethip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr)
 {
 	ethip_nic_t *nic = (ethip_nic_t *) srv->arg;
@@ -312,5 +312,5 @@
 int main(int argc, char *argv[])
 {
-	int rc;
+	errno_t rc;
 
 	printf(NAME ": HelenOS IP over Ethernet service\n");
Index: uspace/srv/net/ethip/ethip.h
===================================================================
--- uspace/srv/net/ethip/ethip.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/ethip/ethip.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -116,6 +116,6 @@
 } ethip_atrans_t;
 
-extern int ethip_iplink_init(ethip_nic_t *);
-extern int ethip_received(iplink_srv_t *, void *, size_t);
+extern errno_t ethip_iplink_init(ethip_nic_t *);
+extern errno_t ethip_received(iplink_srv_t *, void *, size_t);
 
 #endif
Index: uspace/srv/net/ethip/ethip_nic.c
===================================================================
--- uspace/srv/net/ethip/ethip_nic.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/ethip/ethip_nic.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -51,5 +51,5 @@
 #include "pdu.h"
 
-static int ethip_nic_open(service_id_t sid);
+static errno_t ethip_nic_open(service_id_t sid);
 static void ethip_nic_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
 
@@ -57,5 +57,5 @@
 static FIBRIL_MUTEX_INITIALIZE(ethip_discovery_lock);
 
-static int ethip_nic_check_new(void)
+static errno_t ethip_nic_check_new(void)
 {
 	bool already_known;
@@ -63,5 +63,5 @@
 	service_id_t *svcs;
 	size_t count, i;
-	int rc;
+	errno_t rc;
 
 	fibril_mutex_lock(&ethip_discovery_lock);
@@ -147,5 +147,5 @@
 }
 
-static int ethip_nic_open(service_id_t sid)
+static errno_t ethip_nic_open(service_id_t sid)
 {
 	bool in_list = false;
@@ -157,5 +157,5 @@
 		return ENOMEM;
 	
-	int rc = loc_service_get_name(sid, &nic->svc_name);
+	errno_t rc = loc_service_get_name(sid, &nic->svc_name);
 	if (rc != EOK) {
 		log_msg(LOG_DEFAULT, LVL_ERROR, "Failed getting service name.");
@@ -234,5 +234,5 @@
 	uint8_t *addr;
 	size_t size;
-	int rc;
+	errno_t rc;
 
 	rc = async_data_write_accept((void **)&addr, false, 0, 0, 0, &size);
@@ -261,5 +261,5 @@
     ipc_call_t *call)
 {
-	int rc;
+	errno_t rc;
 	void *data;
 	size_t size;
@@ -324,7 +324,7 @@
 }
 
-int ethip_nic_discovery_start(void)
-{
-	int rc = loc_register_cat_change_cb(ethip_nic_cat_change_cb);
+errno_t ethip_nic_discovery_start(void)
+{
+	errno_t rc = loc_register_cat_change_cb(ethip_nic_cat_change_cb);
 	if (rc != EOK) {
 		log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering callback for NIC "
@@ -353,7 +353,7 @@
 }
 
-int ethip_nic_send(ethip_nic_t *nic, void *data, size_t size)
-{
-	int rc;
+errno_t ethip_nic_send(ethip_nic_t *nic, void *data, size_t size)
+{
+	errno_t rc;
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_send(size=%zu)", size);
 	rc = nic_send_frame(nic->sess, data, size);
@@ -368,5 +368,5 @@
  *
  */
-static int ethip_nic_setup_multicast(ethip_nic_t *nic)
+static errno_t ethip_nic_setup_multicast(ethip_nic_t *nic)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_setup_multicast()");
@@ -425,5 +425,5 @@
 	/* Setup the multicast MAC list */
 	
-	int rc = nic_multicast_set_mode(nic->sess, NIC_MULTICAST_LIST,
+	errno_t rc = nic_multicast_set_mode(nic->sess, NIC_MULTICAST_LIST,
 	    mac_list, count);
 	
@@ -432,5 +432,5 @@
 }
 
-int ethip_nic_addr_add(ethip_nic_t *nic, inet_addr_t *addr)
+errno_t ethip_nic_addr_add(ethip_nic_t *nic, inet_addr_t *addr)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_add()");
@@ -445,5 +445,5 @@
 }
 
-int ethip_nic_addr_remove(ethip_nic_t *nic, inet_addr_t *addr)
+errno_t ethip_nic_addr_remove(ethip_nic_t *nic, inet_addr_t *addr)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_remove()");
Index: uspace/srv/net/ethip/ethip_nic.h
===================================================================
--- uspace/srv/net/ethip/ethip_nic.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/ethip/ethip_nic.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -42,9 +42,9 @@
 #include "ethip.h"
 
-extern int ethip_nic_discovery_start(void);
+extern errno_t ethip_nic_discovery_start(void);
 extern ethip_nic_t *ethip_nic_find_by_iplink_sid(service_id_t);
-extern int ethip_nic_send(ethip_nic_t *, void *, size_t);
-extern int ethip_nic_addr_add(ethip_nic_t *, inet_addr_t *);
-extern int ethip_nic_addr_remove(ethip_nic_t *, inet_addr_t *);
+extern errno_t ethip_nic_send(ethip_nic_t *, void *, size_t);
+extern errno_t ethip_nic_addr_add(ethip_nic_t *, inet_addr_t *);
+extern errno_t ethip_nic_addr_remove(ethip_nic_t *, inet_addr_t *);
 extern ethip_link_addr_t *ethip_nic_addr_find(ethip_nic_t *, inet_addr_t *);
 
Index: uspace/srv/net/ethip/pdu.c
===================================================================
--- uspace/srv/net/ethip/pdu.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/ethip/pdu.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -47,5 +47,5 @@
 
 /** Encode Ethernet PDU. */
-int eth_pdu_encode(eth_frame_t *frame, void **rdata, size_t *rsize)
+errno_t eth_pdu_encode(eth_frame_t *frame, void **rdata, size_t *rsize)
 {
 	void *data;
@@ -75,5 +75,5 @@
 
 /** Decode Ethernet PDU. */
-int eth_pdu_decode(void *data, size_t size, eth_frame_t *frame)
+errno_t eth_pdu_decode(void *data, size_t size, eth_frame_t *frame)
 {
 	eth_header_t *hdr;
@@ -106,5 +106,5 @@
 
 /** Encode ARP PDU. */
-int arp_pdu_encode(arp_eth_packet_t *packet, void **rdata, size_t *rsize)
+errno_t arp_pdu_encode(arp_eth_packet_t *packet, void **rdata, size_t *rsize)
 {
 	void *data;
@@ -149,5 +149,5 @@
 
 /** Decode ARP PDU. */
-int arp_pdu_decode(void *data, size_t size, arp_eth_packet_t *packet)
+errno_t arp_pdu_decode(void *data, size_t size, arp_eth_packet_t *packet)
 {
 	arp_eth_packet_fmt_t *pfmt;
Index: uspace/srv/net/ethip/pdu.h
===================================================================
--- uspace/srv/net/ethip/pdu.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/ethip/pdu.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -40,8 +40,8 @@
 #include "ethip.h"
 
-extern int eth_pdu_encode(eth_frame_t *, void **, size_t *);
-extern int eth_pdu_decode(void *, size_t, eth_frame_t *);
-extern int arp_pdu_encode(arp_eth_packet_t *, void **, size_t *);
-extern int arp_pdu_decode(void *, size_t, arp_eth_packet_t *);
+extern errno_t eth_pdu_encode(eth_frame_t *, void **, size_t *);
+extern errno_t eth_pdu_decode(void *, size_t, eth_frame_t *);
+extern errno_t arp_pdu_encode(arp_eth_packet_t *, void **, size_t *);
+extern errno_t arp_pdu_decode(void *, size_t, arp_eth_packet_t *);
 
 #endif
Index: uspace/srv/net/inetsrv/addrobj.c
===================================================================
--- uspace/srv/net/inetsrv/addrobj.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/addrobj.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -78,5 +78,5 @@
 }
 
-int inet_addrobj_add(inet_addrobj_t *addr)
+errno_t inet_addrobj_add(inet_addrobj_t *addr)
 {
 	inet_addrobj_t *aobj;
@@ -212,5 +212,5 @@
 
 /** Send datagram from address object */
-int inet_addrobj_send_dgram(inet_addrobj_t *addr, inet_addr_t *ldest,
+errno_t inet_addrobj_send_dgram(inet_addrobj_t *addr, inet_addr_t *ldest,
     inet_dgram_t *dgram, uint8_t proto, uint8_t ttl, int df)
 {
@@ -229,5 +229,5 @@
 		return EINVAL;
 
-	int rc;
+	errno_t rc;
 	addr48_t ldest_mac;
 
@@ -255,5 +255,5 @@
 
 /** Get IDs of all address objects. */
-int inet_addrobj_get_id_list(sysarg_t **rid_list, size_t *rcount)
+errno_t inet_addrobj_get_id_list(sysarg_t **rid_list, size_t *rcount)
 {
 	sysarg_t *id_list;
Index: uspace/srv/net/inetsrv/addrobj.h
===================================================================
--- uspace/srv/net/inetsrv/addrobj.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/addrobj.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -51,12 +51,12 @@
 extern inet_addrobj_t *inet_addrobj_new(void);
 extern void inet_addrobj_delete(inet_addrobj_t *);
-extern int inet_addrobj_add(inet_addrobj_t *);
+extern errno_t inet_addrobj_add(inet_addrobj_t *);
 extern void inet_addrobj_remove(inet_addrobj_t *);
 extern inet_addrobj_t *inet_addrobj_find(inet_addr_t *, inet_addrobj_find_t);
 extern inet_addrobj_t *inet_addrobj_find_by_name(const char *, inet_link_t *);
 extern inet_addrobj_t *inet_addrobj_get_by_id(sysarg_t);
-extern int inet_addrobj_send_dgram(inet_addrobj_t *, inet_addr_t *,
+extern errno_t inet_addrobj_send_dgram(inet_addrobj_t *, inet_addr_t *,
     inet_dgram_t *, uint8_t, uint8_t, int);
-extern int inet_addrobj_get_id_list(sysarg_t **, size_t *);
+extern errno_t inet_addrobj_get_id_list(sysarg_t **, size_t *);
 
 #endif
Index: uspace/srv/net/inetsrv/icmp.c
===================================================================
--- uspace/srv/net/inetsrv/icmp.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/icmp.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -50,8 +50,8 @@
 #define INET_TTL_MAX 255
 
-static int icmp_recv_echo_request(inet_dgram_t *);
-static int icmp_recv_echo_reply(inet_dgram_t *);
+static errno_t icmp_recv_echo_request(inet_dgram_t *);
+static errno_t icmp_recv_echo_reply(inet_dgram_t *);
 
-int icmp_recv(inet_dgram_t *dgram)
+errno_t icmp_recv(inet_dgram_t *dgram)
 {
 	uint8_t type;
@@ -76,5 +76,5 @@
 }
 
-static int icmp_recv_echo_request(inet_dgram_t *dgram)
+static errno_t icmp_recv_echo_request(inet_dgram_t *dgram)
 {
 	icmp_echo_t *request, *reply;
@@ -82,5 +82,5 @@
 	size_t size;
 	inet_dgram_t rdgram;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "icmp_recv_echo_request()");
@@ -119,5 +119,5 @@
 }
 
-static int icmp_recv_echo_reply(inet_dgram_t *dgram)
+static errno_t icmp_recv_echo_reply(inet_dgram_t *dgram)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "icmp_recv_echo_reply()");
@@ -141,5 +141,5 @@
 }
 
-int icmp_ping_send(uint16_t ident, inetping_sdu_t *sdu)
+errno_t icmp_ping_send(uint16_t ident, inetping_sdu_t *sdu)
 {
 	size_t rsize = sizeof(icmp_echo_t) + sdu->size;
@@ -170,5 +170,5 @@
 	dgram.size = rsize;
 
-	int rc = inet_route_packet(&dgram, IP_PROTO_ICMP, INET_TTL_MAX, 0);
+	errno_t rc = inet_route_packet(&dgram, IP_PROTO_ICMP, INET_TTL_MAX, 0);
 
 	free(rdata);
Index: uspace/srv/net/inetsrv/icmp.h
===================================================================
--- uspace/srv/net/inetsrv/icmp.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/icmp.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -41,6 +41,6 @@
 #include "inetsrv.h"
 
-extern int icmp_recv(inet_dgram_t *);
-extern int icmp_ping_send(uint16_t, inetping_sdu_t *);
+extern errno_t icmp_recv(inet_dgram_t *);
+extern errno_t icmp_ping_send(uint16_t, inetping_sdu_t *);
 
 #endif
Index: uspace/srv/net/inetsrv/icmpv6.c
===================================================================
--- uspace/srv/net/inetsrv/icmpv6.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/icmpv6.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -47,5 +47,5 @@
 #include "pdu.h"
 
-static int icmpv6_recv_echo_request(inet_dgram_t *dgram)
+static errno_t icmpv6_recv_echo_request(inet_dgram_t *dgram)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "icmpv6_recv_echo_request()");
@@ -101,5 +101,5 @@
 	reply->checksum = host2uint16_t_be(cs_all);
 	
-	int rc = inet_route_packet(&rdgram, IP_PROTO_ICMPV6,
+	errno_t rc = inet_route_packet(&rdgram, IP_PROTO_ICMPV6,
 	    INET6_HOP_LIMIT_MAX, 0);
 	
@@ -109,5 +109,5 @@
 }
 
-static int icmpv6_recv_echo_reply(inet_dgram_t *dgram)
+static errno_t icmpv6_recv_echo_reply(inet_dgram_t *dgram)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "icmpv6_recv_echo_reply()");
@@ -132,5 +132,5 @@
 }
 
-int icmpv6_recv(inet_dgram_t *dgram)
+errno_t icmpv6_recv(inet_dgram_t *dgram)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "icmpv6_recv()");
@@ -157,5 +157,5 @@
 }
 
-int icmpv6_ping_send(uint16_t ident, inetping_sdu_t *sdu)
+errno_t icmpv6_ping_send(uint16_t ident, inetping_sdu_t *sdu)
 {
 	size_t rsize = sizeof(icmpv6_message_t) + sdu->size;
@@ -202,5 +202,5 @@
 	request->checksum = host2uint16_t_be(cs_all);
 	
-	int rc = inet_route_packet(&dgram, IP_PROTO_ICMPV6,
+	errno_t rc = inet_route_packet(&dgram, IP_PROTO_ICMPV6,
 	    INET6_HOP_LIMIT_MAX, 0);
 	
Index: uspace/srv/net/inetsrv/icmpv6.h
===================================================================
--- uspace/srv/net/inetsrv/icmpv6.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/icmpv6.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -41,6 +41,6 @@
 #include "inetsrv.h"
 
-extern int icmpv6_recv(inet_dgram_t *);
-extern int icmpv6_ping_send(uint16_t, inetping_sdu_t *);
+extern errno_t icmpv6_recv(inet_dgram_t *);
+extern errno_t icmpv6_ping_send(uint16_t, inetping_sdu_t *);
 
 #endif
Index: uspace/srv/net/inetsrv/inet_link.c
===================================================================
--- uspace/srv/net/inetsrv/inet_link.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/inet_link.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -55,6 +55,6 @@
 static uint16_t ip_ident = 0;
 
-static int inet_iplink_recv(iplink_t *, iplink_recv_sdu_t *, ip_ver_t);
-static int inet_iplink_change_addr(iplink_t *, addr48_t);
+static errno_t inet_iplink_recv(iplink_t *, iplink_recv_sdu_t *, ip_ver_t);
+static errno_t inet_iplink_change_addr(iplink_t *, addr48_t);
 static inet_link_t *inet_link_get_by_id_locked(sysarg_t);
 
@@ -83,9 +83,9 @@
 }
 
-static int inet_iplink_recv(iplink_t *iplink, iplink_recv_sdu_t *sdu, ip_ver_t ver)
+static errno_t inet_iplink_recv(iplink_t *iplink, iplink_recv_sdu_t *sdu, ip_ver_t ver)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_iplink_recv()");
 
-	int rc;
+	errno_t rc;
 	inet_packet_t packet;
 	inet_link_t *ilink;
@@ -121,5 +121,5 @@
 }
 
-static int inet_iplink_change_addr(iplink_t *iplink, addr48_t mac)
+static errno_t inet_iplink_change_addr(iplink_t *iplink, addr48_t mac)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_iplink_change_addr(): "
@@ -158,9 +158,9 @@
 }
 
-int inet_link_open(service_id_t sid)
+errno_t inet_link_open(service_id_t sid)
 {
 	inet_link_t *ilink;
 	inet_addr_t iaddr;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_link_open()");
@@ -312,5 +312,5 @@
  *
  */
-int inet_link_send_dgram(inet_link_t *ilink, addr32_t lsrc, addr32_t ldest,
+errno_t inet_link_send_dgram(inet_link_t *ilink, addr32_t lsrc, addr32_t ldest,
     inet_dgram_t *dgram, uint8_t proto, uint8_t ttl, int df)
 {
@@ -352,5 +352,5 @@
 	packet.size = dgram->size;
 	
-	int rc;
+	errno_t rc;
 	size_t offs = 0;
 	
@@ -387,5 +387,5 @@
  *
  */
-int inet_link_send_dgram6(inet_link_t *ilink, addr48_t ldest,
+errno_t inet_link_send_dgram6(inet_link_t *ilink, addr48_t ldest,
     inet_dgram_t *dgram, uint8_t proto, uint8_t ttl, int df)
 {
@@ -425,5 +425,5 @@
 	packet.size = dgram->size;
 	
-	int rc;
+	errno_t rc;
 	size_t offs = 0;
 	
@@ -471,5 +471,5 @@
 
 /** Get IDs of all links. */
-int inet_link_get_id_list(sysarg_t **rid_list, size_t *rcount)
+errno_t inet_link_get_id_list(sysarg_t **rid_list, size_t *rcount)
 {
 	sysarg_t *id_list;
Index: uspace/srv/net/inetsrv/inet_link.h
===================================================================
--- uspace/srv/net/inetsrv/inet_link.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/inet_link.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -42,11 +42,11 @@
 #include "inetsrv.h"
 
-extern int inet_link_open(service_id_t);
-extern int inet_link_send_dgram(inet_link_t *, addr32_t,
+extern errno_t inet_link_open(service_id_t);
+extern errno_t inet_link_send_dgram(inet_link_t *, addr32_t,
     addr32_t, inet_dgram_t *, uint8_t, uint8_t, int);
-extern int inet_link_send_dgram6(inet_link_t *, addr48_t, inet_dgram_t *,
+extern errno_t inet_link_send_dgram6(inet_link_t *, addr48_t, inet_dgram_t *,
     uint8_t, uint8_t, int);
 extern inet_link_t *inet_link_get_by_id(sysarg_t);
-extern int inet_link_get_id_list(sysarg_t **, size_t *);
+extern errno_t inet_link_get_id_list(sysarg_t **, size_t *);
 
 #endif
Index: uspace/srv/net/inetsrv/inetcfg.c
===================================================================
--- uspace/srv/net/inetsrv/inetcfg.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/inetcfg.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -52,5 +52,5 @@
 #include "sroute.h"
 
-static int inetcfg_addr_create_static(char *name, inet_naddr_t *naddr,
+static errno_t inetcfg_addr_create_static(char *name, inet_naddr_t *naddr,
     sysarg_t link_id, sysarg_t *addr_id)
 {
@@ -58,5 +58,5 @@
 	inet_addrobj_t *addr;
 	inet_addr_t iaddr;
-	int rc;
+	errno_t rc;
 
 	ilink = inet_link_get_by_id(link_id);
@@ -95,5 +95,5 @@
 }
 
-static int inetcfg_addr_delete(sysarg_t addr_id)
+static errno_t inetcfg_addr_delete(sysarg_t addr_id)
 {
 	inet_addrobj_t *addr;
@@ -109,5 +109,5 @@
 }
 
-static int inetcfg_addr_get(sysarg_t addr_id, inet_addr_info_t *ainfo)
+static errno_t inetcfg_addr_get(sysarg_t addr_id, inet_addr_info_t *ainfo)
 {
 	inet_addrobj_t *addr;
@@ -124,5 +124,5 @@
 }
 
-static int inetcfg_addr_get_id(char *name, sysarg_t link_id, sysarg_t *addr_id)
+static errno_t inetcfg_addr_get_id(char *name, sysarg_t link_id, sysarg_t *addr_id)
 {
 	inet_link_t *ilink;
@@ -145,25 +145,25 @@
 }
 
-static int inetcfg_get_addr_list(sysarg_t **addrs, size_t *count)
+static errno_t inetcfg_get_addr_list(sysarg_t **addrs, size_t *count)
 {
 	return inet_addrobj_get_id_list(addrs, count);
 }
 
-static int inetcfg_get_link_list(sysarg_t **addrs, size_t *count)
+static errno_t inetcfg_get_link_list(sysarg_t **addrs, size_t *count)
 {
 	return inet_link_get_id_list(addrs, count);
 }
 
-static int inetcfg_get_sroute_list(sysarg_t **sroutes, size_t *count)
+static errno_t inetcfg_get_sroute_list(sysarg_t **sroutes, size_t *count)
 {
 	return inet_sroute_get_id_list(sroutes, count);
 }
 
-static int inetcfg_link_add(sysarg_t link_id)
+static errno_t inetcfg_link_add(sysarg_t link_id)
 {
 	return inet_link_open(link_id);
 }
 
-static int inetcfg_link_get(sysarg_t link_id, inet_link_info_t *linfo)
+static errno_t inetcfg_link_get(sysarg_t link_id, inet_link_info_t *linfo)
 {
 	inet_link_t *ilink;
@@ -185,10 +185,10 @@
 }
 
-static int inetcfg_link_remove(sysarg_t link_id)
+static errno_t inetcfg_link_remove(sysarg_t link_id)
 {
 	return ENOTSUP;
 }
 
-static int inetcfg_sroute_create(char *name, inet_naddr_t *dest,
+static errno_t inetcfg_sroute_create(char *name, inet_naddr_t *dest,
     inet_addr_t *router, sysarg_t *sroute_id)
 {
@@ -210,5 +210,5 @@
 }
 
-static int inetcfg_sroute_delete(sysarg_t sroute_id)
+static errno_t inetcfg_sroute_delete(sysarg_t sroute_id)
 {
 	inet_sroute_t *sroute;
@@ -224,5 +224,5 @@
 }
 
-static int inetcfg_sroute_get(sysarg_t sroute_id, inet_sroute_info_t *srinfo)
+static errno_t inetcfg_sroute_get(sysarg_t sroute_id, inet_sroute_info_t *srinfo)
 {
 	inet_sroute_t *sroute;
@@ -239,5 +239,5 @@
 }
 
-static int inetcfg_sroute_get_id(char *name, sysarg_t *sroute_id)
+static errno_t inetcfg_sroute_get_id(char *name, sysarg_t *sroute_id)
 {
 	inet_sroute_t *sroute;
@@ -275,5 +275,5 @@
 	
 	inet_naddr_t naddr;
-	int rc = async_data_write_finalize(callid, &naddr, size);
+	errno_t rc = async_data_write_finalize(callid, &naddr, size);
 	if (rc != EOK) {
 		async_answer_0(callid, rc);
@@ -299,5 +299,5 @@
 {
 	sysarg_t addr_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_delete_srv()");
@@ -321,5 +321,5 @@
 	ainfo.name = NULL;
 	
-	int rc = inetcfg_addr_get(addr_id, &ainfo);
+	errno_t rc = inetcfg_addr_get(addr_id, &ainfo);
 	if (rc != EOK) {
 		async_answer_0(iid, rc);
@@ -372,5 +372,5 @@
 	sysarg_t link_id;
 	sysarg_t addr_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_get_id_srv()");
@@ -399,5 +399,5 @@
 	size_t size;
 	sysarg_t *id_buf;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_get_addr_list_srv()");
@@ -419,5 +419,5 @@
 	size = min(act_size, max_size);
 
-	int retval = async_data_read_finalize(rcallid, id_buf, size);
+	errno_t retval = async_data_read_finalize(rcallid, id_buf, size);
 	free(id_buf);
 
@@ -433,5 +433,5 @@
 	size_t size;
 	sysarg_t *id_buf;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_get_addr_list_srv()");
@@ -453,5 +453,5 @@
 	size = min(act_size, max_size);
 
-	int retval = async_data_read_finalize(rcallid, id_buf, size);
+	errno_t retval = async_data_read_finalize(rcallid, id_buf, size);
 	free(id_buf);
 
@@ -467,5 +467,5 @@
 	size_t size;
 	sysarg_t *id_buf;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_get_sroute_list_srv()");
@@ -487,5 +487,5 @@
 	size = min(act_size, max_size);
 
-	int retval = async_data_read_finalize(rcallid, id_buf, size);
+	errno_t retval = async_data_read_finalize(rcallid, id_buf, size);
 	free(id_buf);
 
@@ -496,5 +496,5 @@
 {
 	sysarg_t link_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_link_add_srv()");
@@ -515,5 +515,5 @@
 	sysarg_t link_id;
 	inet_link_info_t linfo;
-	int rc;
+	errno_t rc;
 
 	link_id = IPC_GET_ARG1(*call);
@@ -542,5 +542,5 @@
 	}
 
-	int retval = async_data_read_finalize(name_callid, linfo.name,
+	errno_t retval = async_data_read_finalize(name_callid, linfo.name,
 	    min(name_max_size, str_size(linfo.name)));
 	if (retval != EOK) {
@@ -562,5 +562,5 @@
 {
 	sysarg_t link_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_link_remove_srv()");
@@ -592,5 +592,5 @@
 	
 	inet_naddr_t dest;
-	int rc = async_data_write_finalize(callid, &dest, size);
+	errno_t rc = async_data_write_finalize(callid, &dest, size);
 	if (rc != EOK) {
 		async_answer_0(callid, rc);
@@ -636,5 +636,5 @@
 {
 	sysarg_t sroute_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_delete_srv()");
@@ -658,5 +658,5 @@
 	srinfo.name = NULL;
 	
-	int rc = inetcfg_sroute_get(sroute_id, &srinfo);
+	errno_t rc = inetcfg_sroute_get(sroute_id, &srinfo);
 	if (rc != EOK) {
 		async_answer_0(iid, rc);
@@ -721,5 +721,5 @@
 	char *name;
 	sysarg_t sroute_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_get_id_srv()");
Index: uspace/srv/net/inetsrv/inetping.c
===================================================================
--- uspace/srv/net/inetsrv/inetping.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/inetping.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -58,5 +58,5 @@
 static uint16_t inetping_ident = 0;
 
-static int inetping_send(inetping_client_t *client, inetping_sdu_t *sdu)
+static errno_t inetping_send(inetping_client_t *client, inetping_sdu_t *sdu)
 {
 	if (sdu->src.version != sdu->dest.version)
@@ -73,5 +73,5 @@
 }
 
-static int inetping_get_srcaddr(inetping_client_t *client,
+static errno_t inetping_get_srcaddr(inetping_client_t *client,
     inet_addr_t *remote, inet_addr_t *local)
 {
@@ -94,5 +94,5 @@
 }
 
-int inetping_recv(uint16_t ident, inetping_sdu_t *sdu)
+errno_t inetping_recv(uint16_t ident, inetping_sdu_t *sdu)
 {
 	inetping_client_t *client = inetping_client_find(ident);
@@ -107,5 +107,5 @@
 	aid_t req = async_send_1(exch, INETPING_EV_RECV, sdu->seq_no, &answer);
 
-	int rc = async_data_write_start(exch, &sdu->src, sizeof(sdu->src));
+	errno_t rc = async_data_write_start(exch, &sdu->src, sizeof(sdu->src));
 	if (rc != EOK) {
 		async_exchange_end(exch);
@@ -130,5 +130,5 @@
 	}
 
-	int retval;
+	errno_t retval;
 	async_wait_for(req, &retval);
 
@@ -142,5 +142,5 @@
 
 	inetping_sdu_t sdu;
-	int rc;
+	errno_t rc;
 
 	sdu.seq_no = IPC_GET_ARG1(*icall);
@@ -222,5 +222,5 @@
 	}
 
-	int rc = async_data_write_finalize(callid, &remote, size);
+	errno_t rc = async_data_write_finalize(callid, &remote, size);
 	if (rc != EOK) {
 		async_answer_0(callid, rc);
@@ -254,5 +254,5 @@
 }
 
-static int inetping_client_init(inetping_client_t *client)
+static errno_t inetping_client_init(inetping_client_t *client)
 {
 	async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE);
@@ -289,5 +289,5 @@
 
 	inetping_client_t client;
-	int rc = inetping_client_init(&client);
+	errno_t rc = inetping_client_init(&client);
 	if (rc != EOK)
 		return;
Index: uspace/srv/net/inetsrv/inetping.h
===================================================================
--- uspace/srv/net/inetsrv/inetping.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/inetping.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -42,5 +42,5 @@
 
 extern void inetping_conn(ipc_callid_t, ipc_call_t *, void *);
-extern int inetping_recv(uint16_t, inetping_sdu_t *);
+extern errno_t inetping_recv(uint16_t, inetping_sdu_t *);
 
 #endif
Index: uspace/srv/net/inetsrv/inetsrv.c
===================================================================
--- uspace/srv/net/inetsrv/inetsrv.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/inetsrv.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -84,10 +84,10 @@
 static void inet_default_conn(ipc_callid_t, ipc_call_t *, void *);
 
-static int inet_init(void)
+static errno_t inet_init(void)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_init()");
 	
 	port_id_t port;
-	int rc = async_create_port(INTERFACE_INET,
+	errno_t rc = async_create_port(INTERFACE_INET,
 	    inet_default_conn, NULL, &port);
 	if (rc != EOK)
@@ -135,5 +135,5 @@
 }
 
-static int inet_find_dir(inet_addr_t *src, inet_addr_t *dest, uint8_t tos,
+static errno_t inet_find_dir(inet_addr_t *src, inet_addr_t *dest, uint8_t tos,
     inet_dir_t *dir)
 {
@@ -165,10 +165,10 @@
 }
 
-int inet_route_packet(inet_dgram_t *dgram, uint8_t proto, uint8_t ttl,
+errno_t inet_route_packet(inet_dgram_t *dgram, uint8_t proto, uint8_t ttl,
     int df)
 {
 	inet_dir_t dir;
 	inet_link_t *ilink;
-	int rc;
+	errno_t rc;
 
 	if (dgram->iplink != 0) {
@@ -201,5 +201,5 @@
 }
 
-static int inet_send(inet_client_t *client, inet_dgram_t *dgram,
+static errno_t inet_send(inet_client_t *client, inet_dgram_t *dgram,
     uint8_t proto, uint8_t ttl, int df)
 {
@@ -207,8 +207,8 @@
 }
 
-int inet_get_srcaddr(inet_addr_t *remote, uint8_t tos, inet_addr_t *local)
+errno_t inet_get_srcaddr(inet_addr_t *remote, uint8_t tos, inet_addr_t *local)
 {
 	inet_dir_t dir;
-	int rc;
+	errno_t rc;
 
 	rc = inet_find_dir(NULL, remote, tos, &dir);
@@ -252,5 +252,5 @@
 	
 	inet_addr_t remote;
-	int rc = async_data_write_finalize(callid, &remote, size);
+	errno_t rc = async_data_write_finalize(callid, &remote, size);
 	if (rc != EOK) {
 		async_answer_0(callid, rc);
@@ -314,5 +314,5 @@
 	}
 	
-	int rc = async_data_write_finalize(callid, &dgram.src, size);
+	errno_t rc = async_data_write_finalize(callid, &dgram.src, size);
 	if (rc != EOK) {
 		async_answer_0(callid, rc);
@@ -445,5 +445,5 @@
 }
 
-int inet_ev_recv(inet_client_t *client, inet_dgram_t *dgram)
+errno_t inet_ev_recv(inet_client_t *client, inet_dgram_t *dgram)
 {
 	async_exch_t *exch = async_exchange_begin(client->sess);
@@ -457,5 +457,5 @@
 	    dgram->iplink, &answer);
 
-	int rc = async_data_write_start(exch, &dgram->src, sizeof(inet_addr_t));
+	errno_t rc = async_data_write_start(exch, &dgram->src, sizeof(inet_addr_t));
 	if (rc != EOK) {
 		async_exchange_end(exch);
@@ -480,5 +480,5 @@
 	}
 
-	int retval;
+	errno_t retval;
 	async_wait_for(req, &retval);
 
@@ -486,5 +486,5 @@
 }
 
-int inet_recv_dgram_local(inet_dgram_t *dgram, uint8_t proto)
+errno_t inet_recv_dgram_local(inet_dgram_t *dgram, uint8_t proto)
 {
 	inet_client_t *client;
@@ -509,5 +509,5 @@
 }
 
-int inet_recv_packet(inet_packet_t *packet)
+errno_t inet_recv_packet(inet_packet_t *packet)
 {
 	inet_addrobj_t *addr;
@@ -543,5 +543,5 @@
 int main(int argc, char *argv[])
 {
-	int rc;
+	errno_t rc;
 
 	printf(NAME ": HelenOS Internet Protocol service\n");
Index: uspace/srv/net/inetsrv/inetsrv.h
===================================================================
--- uspace/srv/net/inetsrv/inetsrv.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/inetsrv.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -151,9 +151,9 @@
 } inet_dir_t;
 
-extern int inet_ev_recv(inet_client_t *, inet_dgram_t *);
-extern int inet_recv_packet(inet_packet_t *);
-extern int inet_route_packet(inet_dgram_t *, uint8_t, uint8_t, int);
-extern int inet_get_srcaddr(inet_addr_t *, uint8_t, inet_addr_t *);
-extern int inet_recv_dgram_local(inet_dgram_t *, uint8_t);
+extern errno_t inet_ev_recv(inet_client_t *, inet_dgram_t *);
+extern errno_t inet_recv_packet(inet_packet_t *);
+extern errno_t inet_route_packet(inet_dgram_t *, uint8_t, uint8_t, int);
+extern errno_t inet_get_srcaddr(inet_addr_t *, uint8_t, inet_addr_t *);
+extern errno_t inet_recv_dgram_local(inet_dgram_t *, uint8_t);
 
 #endif
Index: uspace/srv/net/inetsrv/ndp.c
===================================================================
--- uspace/srv/net/inetsrv/ndp.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/ndp.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -64,5 +64,5 @@
 }
 
-static int ndp_send_packet(inet_link_t *link, ndp_packet_t *packet)
+static errno_t ndp_send_packet(inet_link_t *link, ndp_packet_t *packet)
 {
 	inet_dgram_t dgram;
@@ -77,5 +77,5 @@
 }
 
-static int ndp_router_advertisement(inet_dgram_t *dgram, inet_addr_t *router)
+static errno_t ndp_router_advertisement(inet_dgram_t *dgram, inet_addr_t *router)
 {
 	// FIXME TODO
@@ -83,10 +83,10 @@
 }
 
-int ndp_received(inet_dgram_t *dgram)
+errno_t ndp_received(inet_dgram_t *dgram)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "ndp_received()");
 	
 	ndp_packet_t packet;
-	int rc = ndp_pdu_decode(dgram, &packet);
+	errno_t rc = ndp_pdu_decode(dgram, &packet);
 	if (rc != EOK)
 		return rc;
@@ -151,5 +151,5 @@
  *
  */
-int ndp_translate(addr128_t src_addr, addr128_t ip_addr, addr48_t mac_addr,
+errno_t ndp_translate(addr128_t src_addr, addr128_t ip_addr, addr48_t mac_addr,
     inet_link_t *ilink)
 {
@@ -160,5 +160,5 @@
 	}
 	
-	int rc = ntrans_lookup(ip_addr, mac_addr);
+	errno_t rc = ntrans_lookup(ip_addr, mac_addr);
 	if (rc == EOK)
 		return EOK;
Index: uspace/srv/net/inetsrv/ndp.h
===================================================================
--- uspace/srv/net/inetsrv/ndp.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/ndp.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -63,6 +63,6 @@
 } ndp_packet_t;
 
-extern int ndp_received(inet_dgram_t *);
-extern int ndp_translate(addr128_t, addr128_t, addr48_t, inet_link_t *);
+extern errno_t ndp_received(inet_dgram_t *);
+extern errno_t ndp_translate(addr128_t, addr128_t, addr48_t, inet_link_t *);
 
 #endif
Index: uspace/srv/net/inetsrv/ntrans.c
===================================================================
--- uspace/srv/net/inetsrv/ntrans.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/ntrans.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -73,5 +73,5 @@
  *
  */
-int ntrans_add(addr128_t ip_addr, addr48_t mac_addr)
+errno_t ntrans_add(addr128_t ip_addr, addr48_t mac_addr)
 {
 	inet_ntrans_t *ntrans;
@@ -107,5 +107,5 @@
  *
  */
-int ntrans_remove(addr128_t ip_addr)
+errno_t ntrans_remove(addr128_t ip_addr)
 {
 	inet_ntrans_t *ntrans;
@@ -134,5 +134,5 @@
  *
  */
-int ntrans_lookup(addr128_t ip_addr, addr48_t mac_addr)
+errno_t ntrans_lookup(addr128_t ip_addr, addr48_t mac_addr)
 {
 	fibril_mutex_lock(&ntrans_list_lock);
@@ -156,8 +156,8 @@
  *
  */
-int ntrans_wait_timeout(suseconds_t timeout)
+errno_t ntrans_wait_timeout(suseconds_t timeout)
 {
 	fibril_mutex_lock(&ntrans_list_lock);
-	int rc = fibril_condvar_wait_timeout(&ntrans_cv, &ntrans_list_lock,
+	errno_t rc = fibril_condvar_wait_timeout(&ntrans_cv, &ntrans_list_lock,
 	    timeout);
 	fibril_mutex_unlock(&ntrans_list_lock);
Index: uspace/srv/net/inetsrv/ntrans.h
===================================================================
--- uspace/srv/net/inetsrv/ntrans.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/ntrans.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -48,8 +48,8 @@
 } inet_ntrans_t;
 
-extern int ntrans_add(addr128_t, addr48_t);
-extern int ntrans_remove(addr128_t);
-extern int ntrans_lookup(addr128_t, addr48_t);
-extern int ntrans_wait_timeout(suseconds_t);
+extern errno_t ntrans_add(addr128_t, addr48_t);
+extern errno_t ntrans_remove(addr128_t);
+extern errno_t ntrans_lookup(addr128_t, addr48_t);
+extern errno_t ntrans_wait_timeout(suseconds_t);
 
 #endif
Index: uspace/srv/net/inetsrv/pdu.c
===================================================================
--- uspace/srv/net/inetsrv/pdu.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/pdu.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -102,5 +102,5 @@
  *
  */
-int inet_pdu_encode(inet_packet_t *packet, addr32_t src, addr32_t dest,
+errno_t inet_pdu_encode(inet_packet_t *packet, addr32_t src, addr32_t dest,
     size_t offs, size_t mtu, void **rdata, size_t *rsize, size_t *roffs)
 {
@@ -194,5 +194,5 @@
  *
  */
-int inet_pdu_encode6(inet_packet_t *packet, addr128_t src, addr128_t dest,
+errno_t inet_pdu_encode6(inet_packet_t *packet, addr128_t src, addr128_t dest,
     size_t offs, size_t mtu, void **rdata, size_t *rsize, size_t *roffs)
 {
@@ -308,5 +308,5 @@
  *
  */
-int inet_pdu_decode(void *data, size_t size, service_id_t link_id,
+errno_t inet_pdu_decode(void *data, size_t size, service_id_t link_id,
     inet_packet_t *packet)
 {
@@ -385,5 +385,5 @@
  *
  */
-int inet_pdu_decode6(void *data, size_t size, service_id_t link_id,
+errno_t inet_pdu_decode6(void *data, size_t size, service_id_t link_id,
     inet_packet_t *packet)
 {
@@ -474,5 +474,5 @@
  *
  */
-int ndp_pdu_encode(ndp_packet_t *ndp, inet_dgram_t *dgram)
+errno_t ndp_pdu_encode(ndp_packet_t *ndp, inet_dgram_t *dgram)
 {
 	inet_addr_set6(ndp->sender_proto_addr, &dgram->src);
@@ -535,5 +535,5 @@
  *
  */
-int ndp_pdu_decode(inet_dgram_t *dgram, ndp_packet_t *ndp)
+errno_t ndp_pdu_decode(inet_dgram_t *dgram, ndp_packet_t *ndp)
 {
 	ip_ver_t src_ver = inet_addr_get(&dgram->src, NULL,
Index: uspace/srv/net/inetsrv/pdu.h
===================================================================
--- uspace/srv/net/inetsrv/pdu.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/pdu.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -48,13 +48,13 @@
 extern uint16_t inet_checksum_calc(uint16_t, void *, size_t);
 
-extern int inet_pdu_encode(inet_packet_t *, addr32_t, addr32_t, size_t, size_t,
+extern errno_t inet_pdu_encode(inet_packet_t *, addr32_t, addr32_t, size_t, size_t,
     void **, size_t *, size_t *);
-extern int inet_pdu_encode6(inet_packet_t *, addr128_t, addr128_t, size_t,
+extern errno_t inet_pdu_encode6(inet_packet_t *, addr128_t, addr128_t, size_t,
     size_t, void **, size_t *, size_t *);
-extern int inet_pdu_decode(void *, size_t, service_id_t, inet_packet_t *);
-extern int inet_pdu_decode6(void *, size_t, service_id_t, inet_packet_t *);
+extern errno_t inet_pdu_decode(void *, size_t, service_id_t, inet_packet_t *);
+extern errno_t inet_pdu_decode6(void *, size_t, service_id_t, inet_packet_t *);
 
-extern int ndp_pdu_decode(inet_dgram_t *, ndp_packet_t *);
-extern int ndp_pdu_encode(ndp_packet_t *, inet_dgram_t *);
+extern errno_t ndp_pdu_decode(inet_dgram_t *, ndp_packet_t *);
+extern errno_t ndp_pdu_encode(ndp_packet_t *, inet_dgram_t *);
 
 #endif
Index: uspace/srv/net/inetsrv/reass.c
===================================================================
--- uspace/srv/net/inetsrv/reass.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/reass.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -70,8 +70,8 @@
 static reass_dgram_t *reass_dgram_new(void);
 static reass_dgram_t *reass_dgram_get(inet_packet_t *);
-static int reass_dgram_insert_frag(reass_dgram_t *, inet_packet_t *);
+static errno_t reass_dgram_insert_frag(reass_dgram_t *, inet_packet_t *);
 static bool reass_dgram_complete(reass_dgram_t *);
 static void reass_dgram_remove(reass_dgram_t *);
-static int reass_dgram_deliver(reass_dgram_t *);
+static errno_t reass_dgram_deliver(reass_dgram_t *);
 static void reass_dgram_destroy(reass_dgram_t *);
 
@@ -81,8 +81,8 @@
  * @return		EOK on success or ENOMEM.
  */
-int inet_reass_queue_packet(inet_packet_t *packet)
+errno_t inet_reass_queue_packet(inet_packet_t *packet)
 {
 	reass_dgram_t *rdg;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_reass_queue_packet()");
@@ -180,5 +180,5 @@
 }
 
-static int reass_dgram_insert_frag(reass_dgram_t *rdg, inet_packet_t *packet)
+static errno_t reass_dgram_insert_frag(reass_dgram_t *rdg, inet_packet_t *packet)
 {
 	reass_frag_t *frag;
@@ -290,5 +290,5 @@
  * @param rdg		Datagram reassembly structure.
  */
-static int reass_dgram_deliver(reass_dgram_t *rdg)
+static errno_t reass_dgram_deliver(reass_dgram_t *rdg)
 {
 	size_t dgram_size;
@@ -297,5 +297,5 @@
 	uint8_t proto;
 	reass_frag_t *frag;
-	int rc;
+	errno_t rc;
 
 	/*
Index: uspace/srv/net/inetsrv/reass.h
===================================================================
--- uspace/srv/net/inetsrv/reass.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/reass.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -40,5 +40,5 @@
 #include "inetsrv.h"
 
-extern int inet_reass_queue_packet(inet_packet_t *);
+extern errno_t inet_reass_queue_packet(inet_packet_t *);
 
 #endif
Index: uspace/srv/net/inetsrv/sroute.c
===================================================================
--- uspace/srv/net/inetsrv/sroute.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/sroute.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -183,5 +183,5 @@
 
 /** Get IDs of all static routes. */
-int inet_sroute_get_id_list(sysarg_t **rid_list, size_t *rcount)
+errno_t inet_sroute_get_id_list(sysarg_t **rid_list, size_t *rcount)
 {
 	sysarg_t *id_list;
Index: uspace/srv/net/inetsrv/sroute.h
===================================================================
--- uspace/srv/net/inetsrv/sroute.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/inetsrv/sroute.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -49,7 +49,7 @@
 extern inet_sroute_t *inet_sroute_find_by_name(const char *);
 extern inet_sroute_t *inet_sroute_get_by_id(sysarg_t);
-extern int inet_sroute_send_dgram(inet_sroute_t *, inet_addr_t *,
+extern errno_t inet_sroute_send_dgram(inet_sroute_t *, inet_addr_t *,
     inet_dgram_t *, uint8_t, uint8_t, int);
-extern int inet_sroute_get_id_list(sysarg_t **, size_t *);
+extern errno_t inet_sroute_get_id_list(sysarg_t **, size_t *);
 
 
Index: uspace/srv/net/loopip/loopip.c
===================================================================
--- uspace/srv/net/loopip/loopip.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/loopip/loopip.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -49,12 +49,12 @@
 #define NAME  "loopip"
 
-static int loopip_open(iplink_srv_t *srv);
-static int loopip_close(iplink_srv_t *srv);
-static int loopip_send(iplink_srv_t *srv, iplink_sdu_t *sdu);
-static int loopip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu);
-static int loopip_get_mtu(iplink_srv_t *srv, size_t *mtu);
-static int loopip_get_mac48(iplink_srv_t *srv, addr48_t *mac);
-static int loopip_addr_add(iplink_srv_t *srv, inet_addr_t *addr);
-static int loopip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
+static errno_t loopip_open(iplink_srv_t *srv);
+static errno_t loopip_close(iplink_srv_t *srv);
+static errno_t loopip_send(iplink_srv_t *srv, iplink_sdu_t *sdu);
+static errno_t loopip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu);
+static errno_t loopip_get_mtu(iplink_srv_t *srv, size_t *mtu);
+static errno_t loopip_get_mac48(iplink_srv_t *srv, addr48_t *mac);
+static errno_t loopip_addr_add(iplink_srv_t *srv, inet_addr_t *addr);
+static errno_t loopip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
 
 static void loopip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -82,5 +82,5 @@
 } rqueue_entry_t;
 
-static int loopip_recv_fibril(void *arg)
+static errno_t loopip_recv_fibril(void *arg)
 {
 	while (true) {
@@ -99,9 +99,9 @@
 }
 
-static int loopip_init(void)
+static errno_t loopip_init(void)
 {
 	async_set_fallback_port_handler(loopip_client_conn, NULL);
 	
-	int rc = loc_server_register(NAME);
+	errno_t rc = loc_server_register(NAME);
 	if (rc != EOK) {
 		log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server.");
@@ -153,5 +153,5 @@
 }
 
-static int loopip_open(iplink_srv_t *srv)
+static errno_t loopip_open(iplink_srv_t *srv)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_open()");
@@ -159,5 +159,5 @@
 }
 
-static int loopip_close(iplink_srv_t *srv)
+static errno_t loopip_close(iplink_srv_t *srv)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_close()");
@@ -165,5 +165,5 @@
 }
 
-static int loopip_send(iplink_srv_t *srv, iplink_sdu_t *sdu)
+static errno_t loopip_send(iplink_srv_t *srv, iplink_sdu_t *sdu)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_send()");
@@ -194,5 +194,5 @@
 }
 
-static int loopip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu)
+static errno_t loopip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip6_send()");
@@ -223,5 +223,5 @@
 }
 
-static int loopip_get_mtu(iplink_srv_t *srv, size_t *mtu)
+static errno_t loopip_get_mtu(iplink_srv_t *srv, size_t *mtu)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_get_mtu()");
@@ -230,5 +230,5 @@
 }
 
-static int loopip_get_mac48(iplink_srv_t *src, addr48_t *mac)
+static errno_t loopip_get_mac48(iplink_srv_t *src, addr48_t *mac)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_get_mac48()");
@@ -236,10 +236,10 @@
 }
 
-static int loopip_addr_add(iplink_srv_t *srv, inet_addr_t *addr)
-{
-	return EOK;
-}
-
-static int loopip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr)
+static errno_t loopip_addr_add(iplink_srv_t *srv, inet_addr_t *addr)
+{
+	return EOK;
+}
+
+static errno_t loopip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr)
 {
 	return EOK;
@@ -250,5 +250,5 @@
 	printf("%s: HelenOS loopback IP link provider\n", NAME);
 	
-	int rc = log_init(NAME);
+	errno_t rc = log_init(NAME);
 	if (rc != EOK) {
 		printf("%s: Failed to initialize logging: %s.\n", NAME, str_error(rc));
Index: uspace/srv/net/nconfsrv/iplink.c
===================================================================
--- uspace/srv/net/nconfsrv/iplink.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/nconfsrv/iplink.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -49,10 +49,10 @@
 #include "nconfsrv.h"
 
-static int ncs_link_add(service_id_t);
+static errno_t ncs_link_add(service_id_t);
 
 static LIST_INITIALIZE(ncs_links);
 static FIBRIL_MUTEX_INITIALIZE(ncs_links_lock);
 
-static int ncs_link_check_new(void)
+static errno_t ncs_link_check_new(void)
 {
 	bool already_known;
@@ -60,5 +60,5 @@
 	service_id_t *svcs;
 	size_t count, i;
-	int rc;
+	errno_t rc;
 
 	fibril_mutex_lock(&ncs_links_lock);
@@ -124,8 +124,8 @@
 }
 
-static int ncs_link_add(service_id_t sid)
+static errno_t ncs_link_add(service_id_t sid)
 {
 	ncs_link_t *nlink;
-	int rc;
+	errno_t rc;
 
 	assert(fibril_mutex_is_locked(&ncs_links_lock));
@@ -175,7 +175,7 @@
 }
 
-int ncs_link_discovery_start(void)
-{
-	int rc;
+errno_t ncs_link_discovery_start(void)
+{
+	errno_t rc;
 
 	rc = loc_register_cat_change_cb(ncs_link_cat_change_cb);
@@ -205,5 +205,5 @@
 
 /** Get IDs of all links. */
-int ncs_link_get_id_list(sysarg_t **rid_list, size_t *rcount)
+errno_t ncs_link_get_id_list(sysarg_t **rid_list, size_t *rcount)
 {
 	sysarg_t *id_list;
Index: uspace/srv/net/nconfsrv/iplink.h
===================================================================
--- uspace/srv/net/nconfsrv/iplink.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/nconfsrv/iplink.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -41,7 +41,7 @@
 #include "nconfsrv.h"
 
-extern int ncs_link_discovery_start(void);
+extern errno_t ncs_link_discovery_start(void);
 extern ncs_link_t *ncs_link_get_by_id(sysarg_t);
-extern int ncs_link_get_id_list(sysarg_t **, size_t *);
+extern errno_t ncs_link_get_id_list(sysarg_t **, size_t *);
 
 #endif
Index: uspace/srv/net/nconfsrv/nconfsrv.c
===================================================================
--- uspace/srv/net/nconfsrv/nconfsrv.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/nconfsrv/nconfsrv.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -56,8 +56,8 @@
 static void ncs_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
 
-static int ncs_init(void)
+static errno_t ncs_init(void)
 {
 	service_id_t sid;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "ncs_init()");
@@ -105,5 +105,5 @@
 int main(int argc, char *argv[])
 {
-	int rc;
+	errno_t rc;
 
 	printf(NAME ": HelenOS Network configuration service\n");
Index: uspace/srv/net/slip/slip.c
===================================================================
--- uspace/srv/net/slip/slip.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/slip/slip.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -57,12 +57,12 @@
 #define SLIP_ESC_ESC	0335
 
-static int slip_open(iplink_srv_t *);
-static int slip_close(iplink_srv_t *);
-static int slip_send(iplink_srv_t *, iplink_sdu_t *);
-static int slip_send6(iplink_srv_t *, iplink_sdu6_t *);
-static int slip_get_mtu(iplink_srv_t *, size_t *);
-static int slip_get_mac48(iplink_srv_t *, addr48_t *);
-static int slip_addr_add(iplink_srv_t *, inet_addr_t *);
-static int slip_addr_remove(iplink_srv_t *, inet_addr_t *);
+static errno_t slip_open(iplink_srv_t *);
+static errno_t slip_close(iplink_srv_t *);
+static errno_t slip_send(iplink_srv_t *, iplink_sdu_t *);
+static errno_t slip_send6(iplink_srv_t *, iplink_sdu6_t *);
+static errno_t slip_get_mtu(iplink_srv_t *, size_t *);
+static errno_t slip_get_mac48(iplink_srv_t *, addr48_t *);
+static errno_t slip_addr_add(iplink_srv_t *, inet_addr_t *);
+static errno_t slip_addr_remove(iplink_srv_t *, inet_addr_t *);
 
 static iplink_srv_t slip_iplink;
@@ -86,5 +86,5 @@
 static size_t slip_recv_read;
 
-int slip_open(iplink_srv_t *srv)
+errno_t slip_open(iplink_srv_t *srv)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_open()");
@@ -92,5 +92,5 @@
 }
 
-int slip_close(iplink_srv_t *srv)
+errno_t slip_close(iplink_srv_t *srv)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_close()");
@@ -103,5 +103,5 @@
 
 	while (slip_send_pending > 0) {
-		int rc;
+		errno_t rc;
 		size_t nwr;
 
@@ -126,5 +126,5 @@
 }
 
-int slip_send(iplink_srv_t *srv, iplink_sdu_t *sdu)
+errno_t slip_send(iplink_srv_t *srv, iplink_sdu_t *sdu)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_send()");
@@ -162,5 +162,5 @@
 }
 
-int slip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu)
+errno_t slip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_send6()");
@@ -169,5 +169,5 @@
 }
 
-int slip_get_mtu(iplink_srv_t *srv, size_t *mtu)
+errno_t slip_get_mtu(iplink_srv_t *srv, size_t *mtu)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_get_mtu()");
@@ -176,5 +176,5 @@
 }
 
-int slip_get_mac48(iplink_srv_t *src, addr48_t *mac)
+errno_t slip_get_mac48(iplink_srv_t *src, addr48_t *mac)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_get_mac48()");
@@ -182,5 +182,5 @@
 }
 
-int slip_addr_add(iplink_srv_t *srv, inet_addr_t *addr)
+errno_t slip_addr_add(iplink_srv_t *srv, inet_addr_t *addr)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_addr_add()");
@@ -188,5 +188,5 @@
 }
 
-int slip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr)
+errno_t slip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_addr_remove()");
@@ -208,5 +208,5 @@
 {
 	while (slip_recv_pending == 0) {
-		int rc;
+		errno_t rc;
 		size_t nread;
 
@@ -228,5 +228,5 @@
 }
 
-static int slip_recv_fibril(void *arg)
+static errno_t slip_recv_fibril(void *arg)
 {
 	chardev_t *chardev = (chardev_t *) arg;
@@ -234,5 +234,5 @@
 	iplink_recv_sdu_t sdu;
 	uint8_t ch;
-	int rc;
+	errno_t rc;
 
 	sdu.data = recv_final;
@@ -294,5 +294,5 @@
 }
 
-static int slip_init(const char *svcstr, const char *linkstr)
+static errno_t slip_init(const char *svcstr, const char *linkstr)
 {
 	service_id_t svcid;
@@ -304,5 +304,5 @@
 	chardev_t *chardev_out = NULL;
 	fid_t fid;
-	int rc;
+	errno_t rc;
 
 	iplink_srv_init(&slip_iplink);
@@ -415,5 +415,5 @@
 int main(int argc, char *argv[])
 {
-	int rc;
+	errno_t rc;
 
 	printf(NAME ": IP over serial line service\n");
Index: uspace/srv/net/tcp/conn.c
===================================================================
--- uspace/srv/net/tcp/conn.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/conn.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -84,7 +84,7 @@
 
 /** Initialize connections. */
-int tcp_conns_init(void)
-{
-	int rc;
+errno_t tcp_conns_init(void)
+{
+	errno_t rc;
 
 	rc = amap_create(&amap);
@@ -303,8 +303,8 @@
  * Add connection to the connection map.
  */
-int tcp_conn_add(tcp_conn_t *conn)
+errno_t tcp_conn_add(tcp_conn_t *conn)
 {
 	inet_ep2_t aepp;
-	int rc;
+	errno_t rc;
 
 	tcp_conn_addref(conn);
@@ -425,5 +425,5 @@
 tcp_conn_t *tcp_conn_find_ref(inet_ep2_t *epp)
 {
-	int rc;
+	errno_t rc;
 	void *arg;
 	tcp_conn_t *conn;
@@ -1242,5 +1242,5 @@
 	inet_ep2_t aepp;
 	inet_ep2_t oldepp;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_segment_arrived(%p)",
Index: uspace/srv/net/tcp/conn.h
===================================================================
--- uspace/srv/net/tcp/conn.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/conn.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -40,9 +40,9 @@
 #include "tcp_type.h"
 
-extern int tcp_conns_init(void);
+extern errno_t tcp_conns_init(void);
 extern void tcp_conns_fini(void);
 extern tcp_conn_t *tcp_conn_new(inet_ep2_t *);
 extern void tcp_conn_delete(tcp_conn_t *);
-extern int tcp_conn_add(tcp_conn_t *);
+extern errno_t tcp_conn_add(tcp_conn_t *);
 extern void tcp_conn_reset(tcp_conn_t *conn);
 extern void tcp_conn_sync(tcp_conn_t *);
Index: uspace/srv/net/tcp/inet.c
===================================================================
--- uspace/srv/net/tcp/inet.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/inet.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -50,5 +50,5 @@
 #define NAME       "tcp"
 
-static int tcp_inet_ev_recv(inet_dgram_t *dgram);
+static errno_t tcp_inet_ev_recv(inet_dgram_t *dgram);
 static void tcp_received_pdu(tcp_pdu_t *pdu);
 
@@ -58,5 +58,5 @@
 
 /** Received datagram callback */
-static int tcp_inet_ev_recv(inet_dgram_t *dgram)
+static errno_t tcp_inet_ev_recv(inet_dgram_t *dgram)
 {
 	uint8_t *pdu_raw;
@@ -121,5 +121,5 @@
 void tcp_transmit_pdu(tcp_pdu_t *pdu)
 {
-	int rc;
+	errno_t rc;
 	uint8_t *pdu_raw;
 	size_t pdu_raw_size;
@@ -169,7 +169,7 @@
 
 /** Initialize TCP inet interface. */
-int tcp_inet_init(void)
+errno_t tcp_inet_init(void)
 {
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_inet_init()");
Index: uspace/srv/net/tcp/inet.h
===================================================================
--- uspace/srv/net/tcp/inet.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/inet.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -38,5 +38,5 @@
 #include "tcp_type.h"
 
-extern int tcp_inet_init(void);
+extern errno_t tcp_inet_init(void);
 extern void tcp_transmit_pdu(tcp_pdu_t *);
 
Index: uspace/srv/net/tcp/iqueue.c
===================================================================
--- uspace/srv/net/tcp/iqueue.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/iqueue.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -137,5 +137,5 @@
  * @return		EOK on success, ENOENT if no segment is ready
  */
-int tcp_iqueue_get_ready_seg(tcp_iqueue_t *iqueue, tcp_segment_t **seg)
+errno_t tcp_iqueue_get_ready_seg(tcp_iqueue_t *iqueue, tcp_segment_t **seg)
 {
 	tcp_iqueue_entry_t *iqe;
Index: uspace/srv/net/tcp/iqueue.h
===================================================================
--- uspace/srv/net/tcp/iqueue.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/iqueue.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -41,5 +41,5 @@
 extern void tcp_iqueue_insert_seg(tcp_iqueue_t *, tcp_segment_t *);
 extern void tcp_iqueue_remove_seg(tcp_iqueue_t *, tcp_segment_t *);
-extern int tcp_iqueue_get_ready_seg(tcp_iqueue_t *, tcp_segment_t **);
+extern errno_t tcp_iqueue_get_ready_seg(tcp_iqueue_t *, tcp_segment_t **);
 
 #endif
Index: uspace/srv/net/tcp/ncsim.c
===================================================================
--- uspace/srv/net/tcp/ncsim.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/ncsim.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -123,10 +123,10 @@
 
 /** Network condition simulator handler fibril. */
-static int tcp_ncsim_fibril(void *arg)
+static errno_t tcp_ncsim_fibril(void *arg)
 {
 	link_t *link;
 	tcp_squeue_entry_t *sqe;
 	inet_ep2_t rident;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_ncsim_fibril()");
Index: uspace/srv/net/tcp/pdu.c
===================================================================
--- uspace/srv/net/tcp/pdu.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/pdu.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -191,5 +191,5 @@
 }
 
-static int tcp_header_encode(inet_ep2_t *epp, tcp_segment_t *seg,
+static errno_t tcp_header_encode(inet_ep2_t *epp, tcp_segment_t *seg,
     void **header, size_t *size)
 {
@@ -295,5 +295,5 @@
 
 /** Decode incoming PDU */
-int tcp_pdu_decode(tcp_pdu_t *pdu, inet_ep2_t *epp, tcp_segment_t **seg)
+errno_t tcp_pdu_decode(tcp_pdu_t *pdu, inet_ep2_t *epp, tcp_segment_t **seg)
 {
 	tcp_segment_t *nseg;
@@ -319,10 +319,10 @@
 
 /** Encode outgoing PDU */
-int tcp_pdu_encode(inet_ep2_t *epp, tcp_segment_t *seg, tcp_pdu_t **pdu)
+errno_t tcp_pdu_encode(inet_ep2_t *epp, tcp_segment_t *seg, tcp_pdu_t **pdu)
 {
 	tcp_pdu_t *npdu;
 	size_t text_size;
 	uint16_t checksum;
-	int rc;
+	errno_t rc;
 
 	npdu = tcp_pdu_new();
Index: uspace/srv/net/tcp/pdu.h
===================================================================
--- uspace/srv/net/tcp/pdu.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/pdu.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -43,6 +43,6 @@
 extern tcp_pdu_t *tcp_pdu_create(void *, size_t, void *, size_t);
 extern void tcp_pdu_delete(tcp_pdu_t *);
-extern int tcp_pdu_decode(tcp_pdu_t *, inet_ep2_t *, tcp_segment_t **);
-extern int tcp_pdu_encode(inet_ep2_t *, tcp_segment_t *, tcp_pdu_t **);
+extern errno_t tcp_pdu_decode(tcp_pdu_t *, inet_ep2_t *, tcp_segment_t **);
+extern errno_t tcp_pdu_encode(inet_ep2_t *, tcp_segment_t *, tcp_pdu_t **);
 
 #endif
Index: uspace/srv/net/tcp/rqueue.c
===================================================================
--- uspace/srv/net/tcp/rqueue.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/rqueue.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -105,5 +105,5 @@
 
 /** Receive queue handler fibril. */
-static int tcp_rqueue_fibril(void *arg)
+static errno_t tcp_rqueue_fibril(void *arg)
 {
 	link_t *link;
Index: uspace/srv/net/tcp/service.c
===================================================================
--- uspace/srv/net/tcp/service.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/service.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -68,5 +68,5 @@
 static void tcp_service_lst_cstate_change(tcp_conn_t *, void *, tcp_cstate_t);
 
-static int tcp_cconn_create(tcp_client_t *, tcp_conn_t *, tcp_cconn_t **);
+static errno_t tcp_cconn_create(tcp_client_t *, tcp_conn_t *, tcp_cconn_t **);
 
 /** Connection callbacks to tie us to lower layer */
@@ -132,5 +132,5 @@
 	tcp_cconn_t *cconn;
 	inet_ep2_t epp;
-	int rc;
+	errno_t rc;
 	tcp_error_t trc;
 
@@ -298,5 +298,5 @@
  * @return EOK on success or ENOMEM if out of memory
  */
-static int tcp_cconn_create(tcp_client_t *client, tcp_conn_t *conn,
+static errno_t tcp_cconn_create(tcp_client_t *client, tcp_conn_t *conn,
     tcp_cconn_t **rcconn)
 {
@@ -345,5 +345,5 @@
  * @return EOK on success or ENOMEM if out of memory
  */
-static int tcp_clistener_create(tcp_client_t *client, tcp_conn_t *conn,
+static errno_t tcp_clistener_create(tcp_client_t *client, tcp_conn_t *conn,
     tcp_clst_t **rclst)
 {
@@ -390,5 +390,5 @@
  *         is found.
  */
-static int tcp_cconn_get(tcp_client_t *client, sysarg_t id,
+static errno_t tcp_cconn_get(tcp_client_t *client, sysarg_t id,
     tcp_cconn_t **rcconn)
 {
@@ -412,5 +412,5 @@
  *         is found.
  */
-static int tcp_clistener_get(tcp_client_t *client, sysarg_t id,
+static errno_t tcp_clistener_get(tcp_client_t *client, sysarg_t id,
     tcp_clst_t **rclst)
 {
@@ -435,10 +435,10 @@
  * @return EOK on success or an error code
  */
-static int tcp_conn_create_impl(tcp_client_t *client, inet_ep2_t *epp,
+static errno_t tcp_conn_create_impl(tcp_client_t *client, inet_ep2_t *epp,
     sysarg_t *rconn_id)
 {
 	tcp_conn_t *conn;
 	tcp_cconn_t *cconn;
-	int rc;
+	errno_t rc;
 	tcp_error_t trc;
 	char *slocal;
@@ -482,8 +482,8 @@
  * @return EOK on success, ENOENT if no such connection is found
  */
-static int tcp_conn_destroy_impl(tcp_client_t *client, sysarg_t conn_id)
+static errno_t tcp_conn_destroy_impl(tcp_client_t *client, sysarg_t conn_id)
 {
 	tcp_cconn_t *cconn;
-	int rc;
+	errno_t rc;
 
 	rc = tcp_cconn_get(client, conn_id, &cconn);
@@ -509,5 +509,5 @@
  * @return EOK on success or an error code
 */
-static int tcp_listener_create_impl(tcp_client_t *client, inet_ep_t *ep,
+static errno_t tcp_listener_create_impl(tcp_client_t *client, inet_ep_t *ep,
     sysarg_t *rlst_id)
 {
@@ -515,5 +515,5 @@
 	tcp_clst_t *clst;
 	inet_ep2_t epp;
-	int rc;
+	errno_t rc;
 	tcp_error_t trc;
 
@@ -555,8 +555,8 @@
  * @return EOK on success, ENOENT if no such listener is found
  */
-static int tcp_listener_destroy_impl(tcp_client_t *client, sysarg_t lst_id)
+static errno_t tcp_listener_destroy_impl(tcp_client_t *client, sysarg_t lst_id)
 {
 	tcp_clst_t *clst;
-	int rc;
+	errno_t rc;
 
 	rc = tcp_clistener_get(client, lst_id, &clst);
@@ -580,8 +580,8 @@
  * @return EOK on success or an error code
  */
-static int tcp_conn_send_fin_impl(tcp_client_t *client, sysarg_t conn_id)
+static errno_t tcp_conn_send_fin_impl(tcp_client_t *client, sysarg_t conn_id)
 {
 	tcp_cconn_t *cconn;
-	int rc;
+	errno_t rc;
 
 	rc = tcp_cconn_get(client, conn_id, &cconn);
@@ -605,8 +605,8 @@
  * @return EOK on success or an error code
  */
-static int tcp_conn_push_impl(tcp_client_t *client, sysarg_t conn_id)
+static errno_t tcp_conn_push_impl(tcp_client_t *client, sysarg_t conn_id)
 {
 	tcp_cconn_t *cconn;
-	int rc;
+	errno_t rc;
 
 	rc = tcp_cconn_get(client, conn_id, &cconn);
@@ -630,8 +630,8 @@
  * @return EOK on success or an error code
  */
-static int tcp_conn_reset_impl(tcp_client_t *client, sysarg_t conn_id)
+static errno_t tcp_conn_reset_impl(tcp_client_t *client, sysarg_t conn_id)
 {
 	tcp_cconn_t *cconn;
-	int rc;
+	errno_t rc;
 
 	rc = tcp_cconn_get(client, conn_id, &cconn);
@@ -656,9 +656,9 @@
  * @return EOK on success or an error code
  */
-static int tcp_conn_send_impl(tcp_client_t *client, sysarg_t conn_id,
+static errno_t tcp_conn_send_impl(tcp_client_t *client, sysarg_t conn_id,
     void *data, size_t size)
 {
 	tcp_cconn_t *cconn;
-	int rc;
+	errno_t rc;
 	tcp_error_t trc;
 
@@ -686,10 +686,10 @@
  * @return EOK on success or an error code
  */
-static int tcp_conn_recv_impl(tcp_client_t *client, sysarg_t conn_id,
+static errno_t tcp_conn_recv_impl(tcp_client_t *client, sysarg_t conn_id,
     void *data, size_t size, size_t *nrecv)
 {
 	tcp_cconn_t *cconn;
 	xflags_t xflags;
-	int rc;
+	errno_t rc;
 	tcp_error_t trc;
 
@@ -758,5 +758,5 @@
 	inet_ep2_t epp;
 	sysarg_t conn_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_create_srv()");
@@ -802,5 +802,5 @@
 {
 	sysarg_t conn_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_destroy_srv()");
@@ -826,5 +826,5 @@
 	inet_ep_t ep;
 	sysarg_t lst_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_listener_create_srv()");
@@ -870,5 +870,5 @@
 {
 	sysarg_t lst_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_listener_destroy_srv()");
@@ -891,5 +891,5 @@
 {
 	sysarg_t conn_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_send_fin_srv()");
@@ -912,5 +912,5 @@
 {
 	sysarg_t conn_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_push_srv()");
@@ -933,5 +933,5 @@
 {
 	sysarg_t conn_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_reset_srv()");
@@ -957,5 +957,5 @@
 	sysarg_t conn_id;
 	void *data;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_send_srv())");
@@ -1018,5 +1018,5 @@
 	size_t size, rsize;
 	void *data;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_recv_srv()");
@@ -1074,5 +1074,5 @@
 	size_t size, rsize;
 	void *data;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_recv_wait_srv()");
@@ -1246,7 +1246,7 @@
  * @return EOK on success or an error code.
  */
-int tcp_service_init(void)
-{
-	int rc;
+errno_t tcp_service_init(void)
+{
+	errno_t rc;
 	service_id_t sid;
 
Index: uspace/srv/net/tcp/service.h
===================================================================
--- uspace/srv/net/tcp/service.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/service.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -36,5 +36,5 @@
 #define SERVICE_H
 
-extern int tcp_service_init(void);
+extern errno_t tcp_service_init(void);
 
 #endif
Index: uspace/srv/net/tcp/tcp.c
===================================================================
--- uspace/srv/net/tcp/tcp.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/tcp.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -55,7 +55,7 @@
 };
 
-static int tcp_init(void)
+static errno_t tcp_init(void)
 {
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_init()");
@@ -91,5 +91,5 @@
 int main(int argc, char **argv)
 {
-	int rc;
+	errno_t rc;
 
 	printf(NAME ": TCP (Transmission Control Protocol) network module\n");
Index: uspace/srv/net/tcp/test.c
===================================================================
--- uspace/srv/net/tcp/test.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/test.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -47,5 +47,5 @@
 #define RCV_BUF_SIZE 64
 
-static int test_srv(void *arg)
+static errno_t test_srv(void *arg)
 {
 	tcp_conn_t *conn;
@@ -91,5 +91,5 @@
 }
 
-static int test_cli(void *arg)
+static errno_t test_cli(void *arg)
 {
 	tcp_conn_t *conn;
Index: uspace/srv/net/tcp/test/conn.c
===================================================================
--- uspace/srv/net/tcp/test/conn.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/test/conn.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -46,5 +46,5 @@
 PCUT_TEST_BEFORE
 {
-	int rc;
+	errno_t rc;
 
 	/* We will be calling functions that perform logging */
@@ -89,5 +89,5 @@
 	tcp_conn_t *conn, *cfound;
 	inet_ep2_t epp;
-	int rc;
+	errno_t rc;
 
 	inet_ep2_init(&epp);
@@ -119,5 +119,5 @@
 	tcp_conn_t *conn;
 	inet_ep2_t epp;
-	int rc;
+	errno_t rc;
 
 	inet_ep2_init(&epp);
@@ -152,5 +152,5 @@
 	tcp_conn_t *cconn, *sconn;
 	inet_ep2_t cepp, sepp;
-	int rc;
+	errno_t rc;
 
 	/* Client EPP */
Index: uspace/srv/net/tcp/test/iqueue.c
===================================================================
--- uspace/srv/net/tcp/test/iqueue.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/test/iqueue.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -45,5 +45,5 @@
 	inet_ep2_t epp;
 	tcp_segment_t *rseg;
-	int rc;
+	errno_t rc;
 
 	inet_ep2_init(&epp);
@@ -71,5 +71,5 @@
 	void *data;
 	size_t dsize;
-	int rc;
+	errno_t rc;
 
 	inet_ep2_init(&epp);
@@ -117,5 +117,5 @@
 	void *data;
 	size_t dsize;
-	int rc;
+	errno_t rc;
 
 	inet_ep2_init(&epp);
Index: uspace/srv/net/tcp/test/pdu.c
===================================================================
--- uspace/srv/net/tcp/test/pdu.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/test/pdu.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -47,5 +47,5 @@
 	tcp_pdu_t *pdu;
 	inet_ep2_t epp, depp;
-	int rc;
+	errno_t rc;
 
 	inet_ep2_init(&epp);
@@ -78,5 +78,5 @@
 	uint8_t *data;
 	size_t i, dsize;
-	int rc;
+	errno_t rc;
 
 	inet_ep2_init(&epp);
Index: uspace/srv/net/tcp/test/rqueue.c
===================================================================
--- uspace/srv/net/tcp/test/rqueue.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/test/rqueue.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -59,5 +59,5 @@
 PCUT_TEST_BEFORE
 {
-	int rc;
+	errno_t rc;
 
 	/* We will be calling functions that perform logging */
Index: uspace/srv/net/tcp/test/tqueue.c
===================================================================
--- uspace/srv/net/tcp/test/tqueue.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/test/tqueue.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -53,5 +53,5 @@
 PCUT_TEST_BEFORE
 {
-	int rc;
+	errno_t rc;
 
 	/* We will be calling functions that perform logging */
Index: uspace/srv/net/tcp/test/ucall.c
===================================================================
--- uspace/srv/net/tcp/test/ucall.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/test/ucall.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -60,5 +60,5 @@
 PCUT_TEST_BEFORE
 {
-	int rc;
+	errno_t rc;
 
 	/* We will be calling functions that perform logging */
Index: uspace/srv/net/tcp/tqueue.c
===================================================================
--- uspace/srv/net/tcp/tqueue.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/tqueue.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -63,5 +63,5 @@
 static void tcp_tqueue_send_immed(tcp_conn_t *, tcp_segment_t *);
 
-int tcp_tqueue_init(tcp_tqueue_t *tqueue, tcp_conn_t *conn,
+errno_t tcp_tqueue_init(tcp_tqueue_t *tqueue, tcp_conn_t *conn,
     tcp_tqueue_cb_t *cb)
 {
Index: uspace/srv/net/tcp/tqueue.h
===================================================================
--- uspace/srv/net/tcp/tqueue.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/tqueue.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -40,5 +40,5 @@
 #include "tcp_type.h"
 
-extern int tcp_tqueue_init(tcp_tqueue_t *, tcp_conn_t *,
+extern errno_t tcp_tqueue_init(tcp_tqueue_t *, tcp_conn_t *,
     tcp_tqueue_cb_t *);
 extern void tcp_tqueue_clear(tcp_tqueue_t *);
Index: uspace/srv/net/tcp/ucall.c
===================================================================
--- uspace/srv/net/tcp/ucall.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/tcp/ucall.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -69,5 +69,5 @@
 {
 	tcp_conn_t *nconn;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open(%p, %s, %s, %p)",
Index: uspace/srv/net/udp/assoc.c
===================================================================
--- uspace/srv/net/udp/assoc.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/udp/assoc.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -56,10 +56,10 @@
 
 static udp_assoc_t *udp_assoc_find_ref(inet_ep2_t *);
-static int udp_assoc_queue_msg(udp_assoc_t *, inet_ep2_t *, udp_msg_t *);
+static errno_t udp_assoc_queue_msg(udp_assoc_t *, inet_ep2_t *, udp_msg_t *);
 
 /** Initialize associations. */
-int udp_assocs_init(void)
-{
-	int rc;
+errno_t udp_assocs_init(void)
+{
+	errno_t rc;
 
 	rc = amap_create(&amap);
@@ -182,8 +182,8 @@
  * Add association to the association map.
  */
-int udp_assoc_add(udp_assoc_t *assoc)
+errno_t udp_assoc_add(udp_assoc_t *assoc)
 {
 	inet_ep2_t aepp;
-	int rc;
+	errno_t rc;
 
 	udp_assoc_addref(assoc);
@@ -242,9 +242,9 @@
  *			EIO if no route to destination exists
  */
-int udp_assoc_send(udp_assoc_t *assoc, inet_ep_t *remote, udp_msg_t *msg)
+errno_t udp_assoc_send(udp_assoc_t *assoc, inet_ep_t *remote, udp_msg_t *msg)
 {
 	udp_pdu_t *pdu;
 	inet_ep2_t epp;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_send(%p, %p, %p)",
@@ -302,5 +302,5 @@
  * Pull one message from the association's receive queue.
  */
-int udp_assoc_recv(udp_assoc_t *assoc, udp_msg_t **msg, inet_ep_t *remote)
+errno_t udp_assoc_recv(udp_assoc_t *assoc, udp_msg_t **msg, inet_ep_t *remote)
 {
 	link_t *link;
@@ -341,5 +341,5 @@
 {
 	udp_assoc_t *assoc;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_received(%p, %p)", repp, msg);
@@ -380,5 +380,5 @@
 }
 
-static int udp_assoc_queue_msg(udp_assoc_t *assoc, inet_ep2_t *epp,
+static errno_t udp_assoc_queue_msg(udp_assoc_t *assoc, inet_ep2_t *epp,
     udp_msg_t *msg)
 {
@@ -416,5 +416,5 @@
 static udp_assoc_t *udp_assoc_find_ref(inet_ep2_t *epp)
 {
-	int rc;
+	errno_t rc;
 	void *arg;
 	udp_assoc_t *assoc;
Index: uspace/srv/net/udp/assoc.h
===================================================================
--- uspace/srv/net/udp/assoc.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/udp/assoc.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -40,14 +40,14 @@
 #include "udp_type.h"
 
-extern int udp_assocs_init(void);
+extern errno_t udp_assocs_init(void);
 extern udp_assoc_t *udp_assoc_new(inet_ep2_t *, udp_assoc_cb_t *, void *);
 extern void udp_assoc_delete(udp_assoc_t *);
-extern int udp_assoc_add(udp_assoc_t *);
+extern errno_t udp_assoc_add(udp_assoc_t *);
 extern void udp_assoc_remove(udp_assoc_t *);
 extern void udp_assoc_addref(udp_assoc_t *);
 extern void udp_assoc_delref(udp_assoc_t *);
 extern void udp_assoc_set_iplink(udp_assoc_t *, service_id_t);
-extern int udp_assoc_send(udp_assoc_t *, inet_ep_t *, udp_msg_t *);
-extern int udp_assoc_recv(udp_assoc_t *, udp_msg_t **, inet_ep_t *);
+extern errno_t udp_assoc_send(udp_assoc_t *, inet_ep_t *, udp_msg_t *);
+extern errno_t udp_assoc_recv(udp_assoc_t *, udp_msg_t **, inet_ep_t *);
 extern void udp_assoc_received(inet_ep2_t *, udp_msg_t *);
 extern void udp_assoc_reset(udp_assoc_t *);
Index: uspace/srv/net/udp/pdu.c
===================================================================
--- uspace/srv/net/udp/pdu.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/udp/pdu.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -162,5 +162,5 @@
 
 /** Decode incoming PDU */
-int udp_pdu_decode(udp_pdu_t *pdu, inet_ep2_t *epp, udp_msg_t **msg)
+errno_t udp_pdu_decode(udp_pdu_t *pdu, inet_ep2_t *epp, udp_msg_t **msg)
 {
 	udp_msg_t *nmsg;
@@ -209,5 +209,5 @@
 
 /** Encode outgoing PDU */
-int udp_pdu_encode(inet_ep2_t *epp, udp_msg_t *msg, udp_pdu_t **pdu)
+errno_t udp_pdu_encode(inet_ep2_t *epp, udp_msg_t *msg, udp_pdu_t **pdu)
 {
 	udp_pdu_t *npdu;
Index: uspace/srv/net/udp/pdu.h
===================================================================
--- uspace/srv/net/udp/pdu.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/udp/pdu.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -42,6 +42,6 @@
 extern udp_pdu_t *udp_pdu_new(void);
 extern void udp_pdu_delete(udp_pdu_t *);
-extern int udp_pdu_decode(udp_pdu_t *, inet_ep2_t *, udp_msg_t **);
-extern int udp_pdu_encode(inet_ep2_t *, udp_msg_t *, udp_pdu_t **);
+extern errno_t udp_pdu_decode(udp_pdu_t *, inet_ep2_t *, udp_msg_t **);
+extern errno_t udp_pdu_encode(inet_ep2_t *, udp_msg_t *, udp_pdu_t **);
 
 #endif
Index: uspace/srv/net/udp/service.c
===================================================================
--- uspace/srv/net/udp/service.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/udp/service.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -70,5 +70,5 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-static int udp_cassoc_queue_msg(udp_cassoc_t *cassoc, inet_ep2_t *epp,
+static errno_t udp_cassoc_queue_msg(udp_cassoc_t *cassoc, inet_ep2_t *epp,
     udp_msg_t *msg)
 {
@@ -123,5 +123,5 @@
  * @return EOK on soccess, ENOMEM if out of memory
  */
-static int udp_cassoc_create(udp_client_t *client, udp_assoc_t *assoc,
+static errno_t udp_cassoc_create(udp_client_t *client, udp_assoc_t *assoc,
     udp_cassoc_t **rcassoc)
 {
@@ -168,5 +168,5 @@
  *         is found.
  */
-static int udp_cassoc_get(udp_client_t *client, sysarg_t id,
+static errno_t udp_cassoc_get(udp_client_t *client, sysarg_t id,
     udp_cassoc_t **rcassoc)
 {
@@ -207,10 +207,10 @@
  * @return EOK on success or an error code
  */
-static int udp_assoc_create_impl(udp_client_t *client, inet_ep2_t *epp,
+static errno_t udp_assoc_create_impl(udp_client_t *client, inet_ep2_t *epp,
     sysarg_t *rassoc_id)
 {
 	udp_assoc_t *assoc;
 	udp_cassoc_t *cassoc;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_create_impl");
@@ -252,8 +252,8 @@
  * @return EOK on success, ENOENT if no such association is found
  */
-static int udp_assoc_destroy_impl(udp_client_t *client, sysarg_t assoc_id)
+static errno_t udp_assoc_destroy_impl(udp_client_t *client, sysarg_t assoc_id)
 {
 	udp_cassoc_t *cassoc;
-	int rc;
+	errno_t rc;
 
 	rc = udp_cassoc_get(client, assoc_id, &cassoc);
@@ -278,8 +278,8 @@
  * @return EOK on success, ENOENT if no such association is found
  */
-static int udp_assoc_set_nolocal_impl(udp_client_t *client, sysarg_t assoc_id)
+static errno_t udp_assoc_set_nolocal_impl(udp_client_t *client, sysarg_t assoc_id)
 {
 	udp_cassoc_t *cassoc;
-	int rc;
+	errno_t rc;
 
 	rc = udp_cassoc_get(client, assoc_id, &cassoc);
@@ -307,10 +307,10 @@
  * @return EOK on success or an error code
  */
-static int udp_assoc_send_msg_impl(udp_client_t *client, sysarg_t assoc_id,
+static errno_t udp_assoc_send_msg_impl(udp_client_t *client, sysarg_t assoc_id,
     inet_ep_t *dest, void *data, size_t size)
 {
 	udp_msg_t msg;
 	udp_cassoc_t *cassoc;
-	int rc;
+	errno_t rc;
 
 	rc = udp_cassoc_get(client, assoc_id, &cassoc);
@@ -365,5 +365,5 @@
 	inet_ep2_t epp;
 	sysarg_t assoc_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_create_srv()");
@@ -409,5 +409,5 @@
 {
 	sysarg_t assoc_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_destroy_srv()");
@@ -430,5 +430,5 @@
 {
 	sysarg_t assoc_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_NOTE, "udp_assoc_set_nolocal_srv()");
@@ -455,5 +455,5 @@
 	sysarg_t assoc_id;
 	void *data;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_send_msg_srv()");
@@ -552,5 +552,5 @@
 	udp_crcv_queue_entry_t *enext;
 	sysarg_t assoc_id;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_rmsg_info_srv()");
@@ -601,5 +601,5 @@
 	size_t size;
 	size_t off;
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_rmsg_read_srv()");
@@ -752,7 +752,7 @@
  * @return EOK on success or an error code.
  */
-int udp_service_init(void)
-{
-	int rc;
+errno_t udp_service_init(void)
+{
+	errno_t rc;
 	service_id_t sid;
 
Index: uspace/srv/net/udp/service.h
===================================================================
--- uspace/srv/net/udp/service.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/udp/service.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -36,5 +36,5 @@
 #define SERVICE_H
 
-extern int udp_service_init(void);
+extern errno_t udp_service_init(void);
 
 #endif
Index: uspace/srv/net/udp/udp.c
===================================================================
--- uspace/srv/net/udp/udp.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/udp/udp.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -47,7 +47,7 @@
 #define NAME       "udp"
 
-static int udp_init(void)
+static errno_t udp_init(void)
 {
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_init()");
@@ -76,5 +76,5 @@
 int main(int argc, char **argv)
 {
-	int rc;
+	errno_t rc;
 
 	printf(NAME ": UDP (User Datagram Protocol) service\n");
Index: uspace/srv/net/udp/udp_inet.c
===================================================================
--- uspace/srv/net/udp/udp_inet.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/udp/udp_inet.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -45,5 +45,5 @@
 #include "udp_type.h"
 
-static int udp_inet_ev_recv(inet_dgram_t *dgram);
+static errno_t udp_inet_ev_recv(inet_dgram_t *dgram);
 static void udp_received_pdu(udp_pdu_t *pdu);
 
@@ -53,5 +53,5 @@
 
 /** Received datagram callback */
-static int udp_inet_ev_recv(inet_dgram_t *dgram)
+static errno_t udp_inet_ev_recv(inet_dgram_t *dgram)
 {
 	udp_pdu_t *pdu;
@@ -77,7 +77,7 @@
 
 /** Transmit PDU over network layer. */
-int udp_transmit_pdu(udp_pdu_t *pdu)
+errno_t udp_transmit_pdu(udp_pdu_t *pdu)
 {
-	int rc;
+	errno_t rc;
 	inet_dgram_t dgram;
 
@@ -119,7 +119,7 @@
 }
 
-int udp_inet_init(void)
+errno_t udp_inet_init(void)
 {
-	int rc;
+	errno_t rc;
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_inet_init()");
Index: uspace/srv/net/udp/udp_inet.h
===================================================================
--- uspace/srv/net/udp/udp_inet.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/net/udp/udp_inet.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -38,6 +38,6 @@
 #include "udp_type.h"
 
-extern int udp_inet_init(void);
-extern int udp_transmit_pdu(udp_pdu_t *);
+extern errno_t udp_inet_init(void);
+extern errno_t udp_transmit_pdu(udp_pdu_t *);
 
 #endif
