Changeset 87488278 in mainline for uspace/drv/nic/rtl8139/driver.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/rtl8139/driver.c (modified) (3 diffs)

uspace/drv/nic/rtl8139/driver.c

@@ -42 +42 @@
 #include <stdio.h>
 #include <str.h>
+#include <pcapdump_iface.h>
 
 #include "defs.h"
@@ -1305 +1306 @@
                 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;
+                ddf_msg(LVL_ERROR, "Failed adding function to categories");
+                ddf_fun_unbind(fun);
+                return rc;
         }
 
@@ -1316 +1319 @@
         return EOK;
 
-err_fun_bind:
-        ddf_fun_unbind(fun);
+        // err_fun_bind:
+        // ddf_fun_unbind(fun);
 err_fun_create:
         ddf_fun_destroy(fun);