Index: uspace/srv/net/ethip/arp.c
===================================================================
--- uspace/srv/net/ethip/arp.c	(revision d5c1051faf4391647834d99babdd4a44ee5d9700)
+++ 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 d5c1051faf4391647834d99babdd4a44ee5d9700)
+++ 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 d5c1051faf4391647834d99babdd4a44ee5d9700)
+++ 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 d5c1051faf4391647834d99babdd4a44ee5d9700)
+++ 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 d5c1051faf4391647834d99babdd4a44ee5d9700)
+++ 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 d5c1051faf4391647834d99babdd4a44ee5d9700)
+++ 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 d5c1051faf4391647834d99babdd4a44ee5d9700)
+++ 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 d5c1051faf4391647834d99babdd4a44ee5d9700)
+++ 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 d5c1051faf4391647834d99babdd4a44ee5d9700)
+++ 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 d5c1051faf4391647834d99babdd4a44ee5d9700)
+++ 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