Index: uspace/lib/c/generic/device/nic.c
===================================================================
--- uspace/lib/c/generic/device/nic.c	(revision c1f27f1dbf37189072fbb9a7e7902ee64baca85e)
+++ uspace/lib/c/generic/device/nic.c	(revision 2cc7f1601bf37a38c6fbe566c6f941f3ffef337e)
@@ -81,6 +81,6 @@
  *
  */
-int nic_callback_create(async_sess_t *dev_sess, nic_device_id_t device_id,
-    async_client_conn_t cfun, void *carg)
+int nic_callback_create(async_sess_t *dev_sess, async_client_conn_t cfun,
+    void *carg)
 {
 	ipc_call_t answer;
@@ -89,6 +89,6 @@
 	
 	async_exch_t *exch = async_exchange_begin(dev_sess);
-	aid_t req = async_send_2(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
-	    NIC_CALLBACK_CREATE, device_id, &answer);
+	aid_t req = async_send_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
+	    NIC_CALLBACK_CREATE, &answer);
 	
 	rc = async_connect_to_me(exch, 0, 0, 0, cfun, carg);
Index: uspace/lib/c/include/device/nic.h
===================================================================
--- uspace/lib/c/include/device/nic.h	(revision c1f27f1dbf37189072fbb9a7e7902ee64baca85e)
+++ uspace/lib/c/include/device/nic.h	(revision 2cc7f1601bf37a38c6fbe566c6f941f3ffef337e)
@@ -91,6 +91,5 @@
 
 extern int nic_send_frame(async_sess_t *, void *, size_t);
-extern int nic_callback_create(async_sess_t *, nic_device_id_t,
-    async_client_conn_t, void *);
+extern int nic_callback_create(async_sess_t *, async_client_conn_t, void *);
 extern int nic_get_state(async_sess_t *, nic_device_state_t *);
 extern int nic_set_state(async_sess_t *, nic_device_state_t);
Index: uspace/lib/c/include/net/device.h
===================================================================
--- uspace/lib/c/include/net/device.h	(revision c1f27f1dbf37189072fbb9a7e7902ee64baca85e)
+++ uspace/lib/c/include/net/device.h	(revision 2cc7f1601bf37a38c6fbe566c6f941f3ffef337e)
@@ -47,4 +47,10 @@
 #define DEVICE_MAP_IMPLEMENT  INT_MAP_IMPLEMENT
 
+/** Device identifier type. */
+typedef int nic_device_id_t;
+
+/** Invalid device identifier. */
+#define NIC_DEVICE_INVALID_ID  (-1)
+
 #endif
 
Index: uspace/lib/c/include/nic/nic.h
===================================================================
--- uspace/lib/c/include/nic/nic.h	(revision c1f27f1dbf37189072fbb9a7e7902ee64baca85e)
+++ uspace/lib/c/include/nic/nic.h	(revision 2cc7f1601bf37a38c6fbe566c6f941f3ffef337e)
@@ -63,7 +63,4 @@
 #define NIC_MAX_ADDRESS_LENGTH  16
 
-/** Invalid device identifier. */
-#define NIC_DEVICE_INVALID_ID  (-1)
-
 #define NIC_VENDOR_MAX_LENGTH         64
 #define NIC_MODEL_MAX_LENGTH          64
@@ -86,7 +83,4 @@
 
 #define NIC_DEVICE_PRINT_FMT  "%x"
-
-/** Device identifier type. */
-typedef int nic_device_id_t;
 
 /**