Changes in uspace/drv/nic/e1k/e1k.c [3a4c6d9:870841cf] in mainline

File:

• uspace/drv/nic/e1k/e1k.c (modified) (4 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -175 +175 @@
         /** Lock for EEPROM access */
         fibril_mutex_t eeprom_lock;
-
 } e1000_t;
 
@@ -1193 +1192 @@
                 if (frame != NULL) {
                         memcpy(frame->data, e1000->rx_frame_virt[next_tail], frame_size);
-
                         nic_received_frame(nic, frame);
                 } else {
@@ -2203 +2201 @@
                 goto err_fun_bind;
 
-        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;
-        }
+        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
+        if (rc != EOK)
+                goto err_add_to_cat;
+
         return EOK;
 
+err_add_to_cat:
+        ddf_fun_unbind(fun);
 err_fun_bind:
 err_rx_structure:
@@ -2390 +2388 @@
 
         memcpy(e1000->tx_frame_virt[tdt], data, size);
+
         tx_descriptor_addr->phys_addr = PTR_TO_U64(e1000->tx_frame_phys[tdt]);
         tx_descriptor_addr->length = size;