Index: uspace/lib/nic/include/nic.h
===================================================================
--- uspace/lib/nic/include/nic.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/nic/include/nic.h	(revision 58e4d85ce498861509fd56f58413b1cd38ab29f6)
@@ -95,5 +95,5 @@
  * @return error code on error.
  */
-typedef int (*state_change_handler)(nic_t *);
+typedef errno_t (*state_change_handler)(nic_t *);
 
 /**
@@ -108,5 +108,5 @@
  * @return ENOTSUP	If this mode is not supported
  */
-typedef int (*unicast_mode_change_handler)(nic_t *,
+typedef errno_t (*unicast_mode_change_handler)(nic_t *,
     nic_unicast_mode_t, const nic_address_t *, size_t);
 
@@ -122,5 +122,5 @@
  * @return ENOTSUP	If this mode is not supported
  */
-typedef int (*multicast_mode_change_handler)(nic_t *,
+typedef errno_t (*multicast_mode_change_handler)(nic_t *,
     nic_multicast_mode_t, const nic_address_t *, size_t);
 
@@ -134,5 +134,5 @@
  * @return ENOTSUP	If this mode is not supported
  */
-typedef int (*broadcast_mode_change_handler)(nic_t *, nic_broadcast_mode_t);
+typedef errno_t (*broadcast_mode_change_handler)(nic_t *, nic_broadcast_mode_t);
 
 /**
@@ -172,5 +172,5 @@
  * 					limit of these HW filters was reached.
  */
-typedef int (*wol_virtue_add_handler)(nic_t *, const nic_wol_virtue_t *);
+typedef errno_t (*wol_virtue_add_handler)(nic_t *, const nic_wol_virtue_t *);
 
 /**
@@ -195,5 +195,5 @@
  * @return EINVAL	If this mode cannot be set up under no circumstances
  */
-typedef int (*poll_mode_change_handler)(nic_t *,
+typedef errno_t (*poll_mode_change_handler)(nic_t *,
     nic_poll_mode_t, const struct timeval *);
 
@@ -211,10 +211,10 @@
 
 /* Functions called in the main function */
-extern int nic_driver_init(const char *);
+extern errno_t nic_driver_init(const char *);
 extern void nic_driver_implement(driver_ops_t *, ddf_dev_ops_t *,
     nic_iface_t *);
 
 /* Functions called in add_device */
-extern int nic_get_resources(nic_t *, hw_res_list_parsed_t *);
+extern errno_t nic_get_resources(nic_t *, hw_res_list_parsed_t *);
 extern void nic_set_specific(nic_t *, void *);
 extern void nic_set_send_frame_handler(nic_t *, send_frame_handler);
@@ -239,6 +239,6 @@
 extern nic_device_state_t nic_query_state(nic_t *);
 extern void nic_set_tx_busy(nic_t *, int);
-extern int nic_report_address(nic_t *, const nic_address_t *);
-extern int nic_report_poll_mode(nic_t *, nic_poll_mode_t, struct timeval *);
+extern errno_t nic_report_address(nic_t *, const nic_address_t *);
+extern errno_t nic_report_poll_mode(nic_t *, nic_poll_mode_t, struct timeval *);
 extern void nic_query_address(nic_t *, nic_address_t *);
 extern void nic_received_frame(nic_t *, nic_frame_t *);
@@ -268,5 +268,5 @@
 extern void nic_query_blocked_sources(const nic_t *,
     size_t, nic_address_t *, size_t *);
-extern int nic_query_vlan_mask(const nic_t *, nic_vlan_mask_t *);
+extern errno_t nic_query_vlan_mask(const nic_t *, nic_vlan_mask_t *);
 extern int nic_query_wol_max_caps(const nic_t *, nic_wv_type_t);
 extern void nic_set_wol_max_caps(nic_t *, nic_wv_type_t, int);
Index: uspace/lib/nic/include/nic_addr_db.h
===================================================================
--- uspace/lib/nic/include/nic_addr_db.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/nic/include/nic_addr_db.h	(revision 58e4d85ce498861509fd56f58413b1cd38ab29f6)
@@ -55,9 +55,9 @@
 
 
-extern int nic_addr_db_init(nic_addr_db_t *db, size_t addr_len);
+extern errno_t nic_addr_db_init(nic_addr_db_t *db, size_t addr_len);
 extern void nic_addr_db_clear(nic_addr_db_t *db);
 extern void nic_addr_db_destroy(nic_addr_db_t *db);
-extern int nic_addr_db_insert(nic_addr_db_t *db, const uint8_t *addr);
-extern int nic_addr_db_remove(nic_addr_db_t *db, const uint8_t *addr);
+extern errno_t nic_addr_db_insert(nic_addr_db_t *db, const uint8_t *addr);
+extern errno_t nic_addr_db_remove(nic_addr_db_t *db, const uint8_t *addr);
 extern bool nic_addr_db_contains(const nic_addr_db_t *db, const uint8_t *addr);
 extern void nic_addr_db_foreach(const nic_addr_db_t *db,
Index: uspace/lib/nic/include/nic_ev.h
===================================================================
--- uspace/lib/nic/include/nic_ev.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/nic/include/nic_ev.h	(revision 58e4d85ce498861509fd56f58413b1cd38ab29f6)
@@ -43,7 +43,7 @@
 #include <stddef.h>
 
-extern int nic_ev_addr_changed(async_sess_t *, const nic_address_t *);
-extern int nic_ev_device_state(async_sess_t *, sysarg_t);
-extern int nic_ev_received(async_sess_t *, void *, size_t);
+extern errno_t nic_ev_addr_changed(async_sess_t *, const nic_address_t *);
+extern errno_t nic_ev_device_state(async_sess_t *, sysarg_t);
+extern errno_t nic_ev_received(async_sess_t *, void *, size_t);
 
 #endif
Index: uspace/lib/nic/include/nic_impl.h
===================================================================
--- uspace/lib/nic/include/nic_impl.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/nic/include/nic_impl.h	(revision 58e4d85ce498861509fd56f58413b1cd38ab29f6)
@@ -46,42 +46,42 @@
  * inject some adaptation layer between the DDF call and NICF implementation */
 
-extern int nic_get_address_impl(ddf_fun_t *dev_fun, nic_address_t *address);
-extern int nic_send_frame_impl(ddf_fun_t *dev_fun, void *data, size_t size);
-extern int nic_callback_create_impl(ddf_fun_t *dev_fun);
-extern int nic_get_state_impl(ddf_fun_t *dev_fun, nic_device_state_t *state);
-extern int nic_set_state_impl(ddf_fun_t *dev_fun, nic_device_state_t state);
-extern int nic_get_stats_impl(ddf_fun_t *dev_fun, nic_device_stats_t *stats);
-extern int nic_unicast_get_mode_impl(ddf_fun_t *dev_fun,
+extern errno_t nic_get_address_impl(ddf_fun_t *dev_fun, nic_address_t *address);
+extern errno_t nic_send_frame_impl(ddf_fun_t *dev_fun, void *data, size_t size);
+extern errno_t nic_callback_create_impl(ddf_fun_t *dev_fun);
+extern errno_t nic_get_state_impl(ddf_fun_t *dev_fun, nic_device_state_t *state);
+extern errno_t nic_set_state_impl(ddf_fun_t *dev_fun, nic_device_state_t state);
+extern errno_t nic_get_stats_impl(ddf_fun_t *dev_fun, nic_device_stats_t *stats);
+extern errno_t nic_unicast_get_mode_impl(ddf_fun_t *dev_fun,
     nic_unicast_mode_t *, size_t, nic_address_t *, size_t *);
-extern int nic_unicast_set_mode_impl(ddf_fun_t *dev_fun,
+extern errno_t nic_unicast_set_mode_impl(ddf_fun_t *dev_fun,
     nic_unicast_mode_t, const nic_address_t *, size_t);
-extern int nic_multicast_get_mode_impl(ddf_fun_t *dev_fun,
+extern errno_t nic_multicast_get_mode_impl(ddf_fun_t *dev_fun,
     nic_multicast_mode_t *, size_t, nic_address_t *, size_t *);
-extern int nic_multicast_set_mode_impl(ddf_fun_t *dev_fun,
+extern errno_t nic_multicast_set_mode_impl(ddf_fun_t *dev_fun,
     nic_multicast_mode_t, const nic_address_t *, size_t);
-extern int nic_broadcast_get_mode_impl(ddf_fun_t *, nic_broadcast_mode_t *);
-extern int nic_broadcast_set_mode_impl(ddf_fun_t *, nic_broadcast_mode_t);
-extern int nic_blocked_sources_get_impl(ddf_fun_t *,
+extern errno_t nic_broadcast_get_mode_impl(ddf_fun_t *, nic_broadcast_mode_t *);
+extern errno_t nic_broadcast_set_mode_impl(ddf_fun_t *, nic_broadcast_mode_t);
+extern errno_t nic_blocked_sources_get_impl(ddf_fun_t *,
     size_t, nic_address_t *, size_t *);
-extern int nic_blocked_sources_set_impl(ddf_fun_t *, const nic_address_t *, size_t);
-extern int nic_vlan_get_mask_impl(ddf_fun_t *, nic_vlan_mask_t *);
-extern int nic_vlan_set_mask_impl(ddf_fun_t *, const nic_vlan_mask_t *);
-extern int nic_wol_virtue_add_impl(ddf_fun_t *dev_fun, nic_wv_type_t type,
+extern errno_t nic_blocked_sources_set_impl(ddf_fun_t *, const nic_address_t *, size_t);
+extern errno_t nic_vlan_get_mask_impl(ddf_fun_t *, nic_vlan_mask_t *);
+extern errno_t nic_vlan_set_mask_impl(ddf_fun_t *, const nic_vlan_mask_t *);
+extern errno_t nic_wol_virtue_add_impl(ddf_fun_t *dev_fun, nic_wv_type_t type,
     const void *data, size_t length, nic_wv_id_t *new_id);
-extern int nic_wol_virtue_remove_impl(ddf_fun_t *dev_fun, nic_wv_id_t id);
-extern int nic_wol_virtue_probe_impl(ddf_fun_t *dev_fun, nic_wv_id_t id,
+extern errno_t nic_wol_virtue_remove_impl(ddf_fun_t *dev_fun, nic_wv_id_t id);
+extern errno_t nic_wol_virtue_probe_impl(ddf_fun_t *dev_fun, nic_wv_id_t id,
     nic_wv_type_t *type, size_t max_length, void *data, size_t *length);
-extern int nic_wol_virtue_list_impl(ddf_fun_t *dev_fun, nic_wv_type_t type,
+extern errno_t nic_wol_virtue_list_impl(ddf_fun_t *dev_fun, nic_wv_type_t type,
     size_t max_count, nic_wv_id_t *id_list, size_t *id_count);
-extern int nic_wol_virtue_get_caps_impl(ddf_fun_t *, nic_wv_type_t, int *);
-extern int nic_poll_get_mode_impl(ddf_fun_t *,
+extern errno_t nic_wol_virtue_get_caps_impl(ddf_fun_t *, nic_wv_type_t, int *);
+extern errno_t nic_poll_get_mode_impl(ddf_fun_t *,
     nic_poll_mode_t *, struct timeval *);
-extern int nic_poll_set_mode_impl(ddf_fun_t *,
+extern errno_t nic_poll_set_mode_impl(ddf_fun_t *,
     nic_poll_mode_t, const struct timeval *);
-extern int nic_poll_now_impl(ddf_fun_t *);
+extern errno_t nic_poll_now_impl(ddf_fun_t *);
 
 extern void nic_default_handler_impl(ddf_fun_t *dev_fun,
 	ipc_callid_t callid, ipc_call_t *call);
-extern int nic_open_impl(ddf_fun_t *fun);
+extern errno_t nic_open_impl(ddf_fun_t *fun);
 extern void nic_close_impl(ddf_fun_t *fun);
 
Index: uspace/lib/nic/include/nic_rx_control.h
===================================================================
--- uspace/lib/nic/include/nic_rx_control.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/nic/include/nic_rx_control.h	(revision 58e4d85ce498861509fd56f58413b1cd38ab29f6)
@@ -114,7 +114,7 @@
 } __attribute__ ((packed)) vlan_header_t;
 
-extern int nic_rxc_init(nic_rxc_t *rxc);
-extern int nic_rxc_clear(nic_rxc_t *rxc);
-extern int nic_rxc_set_addr(nic_rxc_t *rxc,
+extern errno_t nic_rxc_init(nic_rxc_t *rxc);
+extern errno_t nic_rxc_clear(nic_rxc_t *rxc);
+extern errno_t nic_rxc_set_addr(nic_rxc_t *rxc,
 	const nic_address_t *prev_addr, const nic_address_t *curr_addr);
 extern bool nic_rxc_check(const nic_rxc_t *rxc,
@@ -126,20 +126,20 @@
 extern void nic_rxc_unicast_get_mode(const nic_rxc_t *, nic_unicast_mode_t *,
 	size_t max_count, nic_address_t *address_list, size_t *address_count);
-extern int nic_rxc_unicast_set_mode(nic_rxc_t *rxc, nic_unicast_mode_t mode,
+extern errno_t nic_rxc_unicast_set_mode(nic_rxc_t *rxc, nic_unicast_mode_t mode,
 	const nic_address_t *address_list, size_t address_count);
 extern void nic_rxc_multicast_get_mode(const nic_rxc_t *,
 	nic_multicast_mode_t *, size_t, nic_address_t *, size_t *);
-extern int nic_rxc_multicast_set_mode(nic_rxc_t *, nic_multicast_mode_t mode,
+extern errno_t nic_rxc_multicast_set_mode(nic_rxc_t *, nic_multicast_mode_t mode,
 	const nic_address_t *address_list, size_t address_count);
 extern void nic_rxc_broadcast_get_mode(const nic_rxc_t *,
 	nic_broadcast_mode_t *mode);
-extern int nic_rxc_broadcast_set_mode(nic_rxc_t *,
+extern errno_t nic_rxc_broadcast_set_mode(nic_rxc_t *,
 	nic_broadcast_mode_t mode);
 extern void nic_rxc_blocked_sources_get(const nic_rxc_t *,
 	size_t max_count, nic_address_t *address_list, size_t *address_count);
-extern int nic_rxc_blocked_sources_set(nic_rxc_t *,
+extern errno_t nic_rxc_blocked_sources_set(nic_rxc_t *,
 	const nic_address_t *address_list, size_t address_count);
-extern int nic_rxc_vlan_get_mask(const nic_rxc_t *rxc, nic_vlan_mask_t *mask);
-extern int nic_rxc_vlan_set_mask(nic_rxc_t *rxc, const nic_vlan_mask_t *mask);
+extern errno_t nic_rxc_vlan_get_mask(const nic_rxc_t *rxc, nic_vlan_mask_t *mask);
+extern errno_t nic_rxc_vlan_set_mask(nic_rxc_t *rxc, const nic_vlan_mask_t *mask);
 
 #endif
Index: uspace/lib/nic/include/nic_wol_virtues.h
===================================================================
--- uspace/lib/nic/include/nic_wol_virtues.h	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/nic/include/nic_wol_virtues.h	(revision 58e4d85ce498861509fd56f58413b1cd38ab29f6)
@@ -74,10 +74,10 @@
 } nic_wol_virtues_t;
 
-extern int nic_wol_virtues_init(nic_wol_virtues_t *);
+extern errno_t nic_wol_virtues_init(nic_wol_virtues_t *);
 extern void nic_wol_virtues_clear(nic_wol_virtues_t *);
-extern int nic_wol_virtues_verify(nic_wv_type_t, const void *, size_t);
-extern int nic_wol_virtues_list(const nic_wol_virtues_t *, nic_wv_type_t type,
+extern errno_t nic_wol_virtues_verify(nic_wv_type_t, const void *, size_t);
+extern errno_t nic_wol_virtues_list(const nic_wol_virtues_t *, nic_wv_type_t type,
 	size_t max_count, nic_wv_id_t *id_list, size_t *id_count);
-extern int nic_wol_virtues_add(nic_wol_virtues_t *, nic_wol_virtue_t *);
+extern errno_t nic_wol_virtues_add(nic_wol_virtues_t *, nic_wol_virtue_t *);
 extern nic_wol_virtue_t *nic_wol_virtues_remove(nic_wol_virtues_t *,
 	nic_wv_id_t);
