Index: uspace/drv/nic/e1k/e1k.c
===================================================================
--- uspace/drv/nic/e1k/e1k.c	(revision c37c24cca194a603ab7ea2ef3b1f6981cf99692d)
+++ uspace/drv/nic/e1k/e1k.c	(revision e55d2c15dfef177ecdff9b2dda527a31ec9cad50)
@@ -2202,16 +2202,8 @@
 		goto err_fun_bind;
 
-	// rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
-	// if (rc != EOK)
-	// 	goto err_add_to_cat;
-
-	// rc = ddf_fun_add_to_category(fun, "pcap");
-	// if (rc != EOK) {
-	// 	ddf_msg(LVL_ERROR, "Failed adding function to category pcap");
-	// 	goto err_add_to_cat;
-	// }
 	rc = nic_fun_add_to_cats(fun);
 	if (rc != EOK) {
 		ddf_msg(LVL_ERROR, "Failed adding function to categories");
+		ddf_fun_unbind(fun);
 		return rc;
 	}
Index: uspace/drv/nic/ne2k/ne2k.c
===================================================================
--- uspace/drv/nic/ne2k/ne2k.c	(revision c37c24cca194a603ab7ea2ef3b1f6981cf99692d)
+++ uspace/drv/nic/ne2k/ne2k.c	(revision e55d2c15dfef177ecdff9b2dda527a31ec9cad50)
@@ -43,4 +43,5 @@
 #include <str_error.h>
 #include <async.h>
+#include <ddf/log.h>
 #include "dp8390.h"
 
@@ -443,15 +444,8 @@
 	}
 
-	rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
+	rc = nic_fun_add_to_cats(fun);
 	if (rc != EOK) {
+		ddf_msg(LVL_ERROR, "Failed adding function to categories");
 		ddf_fun_unbind(fun);
-		ddf_fun_destroy(fun);
-		return rc;
-	}
-	rc = ddf_fun_add_to_category(fun, "pcap");
-	if (rc != EOK) {
-		//ddf_msg(LVL_ERROR, "Failed adding function to category pcap");
-		ddf_fun_unbind(fun);
-		ddf_fun_destroy(fun);
 		return rc;
 	}
@@ -483,4 +477,5 @@
 	nic_driver_implement(&ne2k_driver_ops, &ne2k_dev_ops, &ne2k_nic_iface);
 
+	ddf_log_init(NAME);
 	return ddf_driver_main(&ne2k_driver);
 }
Index: uspace/drv/nic/rtl8139/driver.c
===================================================================
--- uspace/drv/nic/rtl8139/driver.c	(revision c37c24cca194a603ab7ea2ef3b1f6981cf99692d)
+++ uspace/drv/nic/rtl8139/driver.c	(revision e55d2c15dfef177ecdff9b2dda527a31ec9cad50)
@@ -1308,14 +1308,10 @@
 		goto err_fun_create;
 	}
-	rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
+
+	rc = nic_fun_add_to_cats(fun);
 	if (rc != EOK) {
-		ddf_msg(LVL_ERROR, "Failed adding function to category");
-		goto err_fun_bind;
-	}
-
-	rc = ddf_fun_add_to_category(fun, "pcap");
-	if (rc != EOK) {
-		ddf_msg(LVL_ERROR, "Failed adding function to category pcap");
-		goto err_fun_bind;
+		ddf_msg(LVL_ERROR, "Failed adding function to categories");
+		ddf_fun_unbind(fun);
+		return rc;
 	}
 
@@ -1325,6 +1321,6 @@
 	return EOK;
 
-err_fun_bind:
-	ddf_fun_unbind(fun);
+	// err_fun_bind:
+	// ddf_fun_unbind(fun);
 err_fun_create:
 	ddf_fun_destroy(fun);
Index: uspace/drv/nic/rtl8169/driver.c
===================================================================
--- uspace/drv/nic/rtl8169/driver.c	(revision c37c24cca194a603ab7ea2ef3b1f6981cf99692d)
+++ uspace/drv/nic/rtl8169/driver.c	(revision e55d2c15dfef177ecdff9b2dda527a31ec9cad50)
@@ -457,8 +457,9 @@
 	}
 
-	rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
+	rc = nic_fun_add_to_cats(fun);
 	if (rc != EOK) {
-		ddf_msg(LVL_ERROR, "Failed adding function to category");
-		goto err_fun_bind;
+		ddf_msg(LVL_ERROR, "Failed adding function to categories");
+		ddf_fun_unbind(fun);
+		return rc;
 	}
 
@@ -467,6 +468,6 @@
 	return EOK;
 
-err_fun_bind:
-	ddf_fun_unbind(fun);
+	// err_fun_bind:
+	// ddf_fun_unbind(fun);
 err_fun_create:
 	ddf_fun_destroy(fun);
Index: uspace/drv/nic/virtio-net/virtio-net.c
===================================================================
--- uspace/drv/nic/virtio-net/virtio-net.c	(revision c37c24cca194a603ab7ea2ef3b1f6981cf99692d)
+++ uspace/drv/nic/virtio-net/virtio-net.c	(revision e55d2c15dfef177ecdff9b2dda527a31ec9cad50)
@@ -423,8 +423,9 @@
 	}
 
-	rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
+	rc = nic_fun_add_to_cats(fun);
 	if (rc != EOK) {
-		ddf_msg(LVL_ERROR, "Failed adding function to category");
-		goto unbind;
+		ddf_msg(LVL_ERROR, "Failed adding function to categories");
+		ddf_fun_unbind(fun);
+		return rc;
 	}
 
@@ -432,14 +433,8 @@
 	    ddf_dev_get_name(dev));
 
-	rc = ddf_fun_add_to_category(fun, "pcap");
-	if (rc != EOK) {
-		ddf_msg(LVL_ERROR, "Failed adding function to category pcap");
-		goto unbind;
-	}
-
-	return EOK;
-
-unbind:
-	ddf_fun_unbind(fun);
+	return EOK;
+
+	// unbind:
+	// ddf_fun_unbind(fun);
 destroy:
 	ddf_fun_destroy(fun);