Changeset 87488278 in mainline for uspace/drv/nic/e1k/e1k.c

Timestamp:

2024-06-27T08:07:31Z (6 days ago)

Author:

GitHub <noreply@…>

Parents:

af3235d (diff), 2a0c827c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-06-27 08:07:31)

git-committer:

GitHub <noreply@…> (2024-06-27 08:07:31)

Message:

Merge 2a0c827c42eafb070de3bbe3c98a1d8a2b77d719 into af3235d07726dfc8b146c760a25544ea3ac29f9d

File:

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

uspace/drv/nic/e1k/e1k.c

@@ -49 +49 @@
 #include <nic.h>
 #include <ops/nic.h>
+#include <pcapdump_iface.h>
 #include "e1k.h"
 
@@ -174 +175 @@
         /** Lock for EEPROM access */
         fibril_mutex_t eeprom_lock;
+
 } e1000_t;
 
@@ -1189 +1191 @@
                 if (frame != NULL) {
                         memcpy(frame->data, e1000->rx_frame_virt[next_tail], frame_size);
+
                         nic_received_frame(nic, frame);
                 } else {
@@ -2198 +2201 @@
                 goto err_fun_bind;
 
-        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
-        if (rc != EOK)
-                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;
+        }
         return EOK;
 
-err_add_to_cat:
-        ddf_fun_unbind(fun);
+        // err_add_to_cat:
+        // ddf_fun_unbind(fun);
 err_fun_bind:
 err_rx_structure:
@@ -2365 +2370 @@
 
         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;