Index: uspace/drv/nic/e1k/e1k.c
===================================================================
--- uspace/drv/nic/e1k/e1k.c	(revision 9bd461576e68b9b31d5509e4ada6be4c30221881)
+++ uspace/drv/nic/e1k/e1k.c	(revision 54a1ca73a9e9c3abb6bdcc1ae84ff0213fe6f721)
@@ -32,7 +32,4 @@
  *
  */
-
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
 
 #include <assert.h>
@@ -2153,5 +2150,4 @@
 	nic_set_ddf_fun(nic, fun);
 	ddf_fun_set_ops(fun, &e1000_dev_ops);
-	ddf_fun_data_implant(fun, nic);
 	
 	rc = e1000_register_int_handler(nic);
Index: uspace/drv/nic/ne2k/ne2k.c
===================================================================
--- uspace/drv/nic/ne2k/ne2k.c	(revision 9bd461576e68b9b31d5509e4ada6be4c30221881)
+++ uspace/drv/nic/ne2k/ne2k.c	(revision 54a1ca73a9e9c3abb6bdcc1ae84ff0213fe6f721)
@@ -37,7 +37,4 @@
  * @brief Bridge between NICF, DDF and business logic for the NIC
  */
-
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
 
 #include <stdio.h>
@@ -405,7 +402,7 @@
 		return ENOMEM;
 	}
+	
 	nic_set_ddf_fun(nic_data, fun);
 	ddf_fun_set_ops(fun, &ne2k_dev_ops);
-	ddf_fun_data_implant(fun, nic_data);
 	
 	rc = ddf_fun_bind(fun);
Index: uspace/drv/nic/rtl8139/driver.c
===================================================================
--- uspace/drv/nic/rtl8139/driver.c	(revision 9bd461576e68b9b31d5509e4ada6be4c30221881)
+++ uspace/drv/nic/rtl8139/driver.c	(revision 54a1ca73a9e9c3abb6bdcc1ae84ff0213fe6f721)
@@ -26,7 +26,4 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
 
 #include <assert.h>
@@ -1331,7 +1328,7 @@
 		goto err_srv;
 	}
+
 	nic_set_ddf_fun(nic_data, fun);
 	ddf_fun_set_ops(fun, &rtl8139_dev_ops);
-	ddf_fun_data_implant(fun, nic_data);
 
 	rc = ddf_fun_bind(fun);
Index: uspace/lib/nic/src/nic_driver.c
===================================================================
--- uspace/lib/nic/src/nic_driver.c	(revision 9bd461576e68b9b31d5509e4ada6be4c30221881)
+++ uspace/lib/nic/src/nic_driver.c	(revision 54a1ca73a9e9c3abb6bdcc1ae84ff0213fe6f721)
@@ -914,5 +914,5 @@
 nic_t *nic_get_from_ddf_fun(ddf_fun_t *fun)
 {
-	return (nic_t *) ddf_fun_data_get(fun);
+	return (nic_t *) ddf_dev_data_get(ddf_fun_get_dev(fun));
 }