Changeset 8d9217d in mainline for uspace/drv/nic

Timestamp:

2024-03-20T17:06:29Z (19 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

384f081

Parents:

78edb5e

Message:

nic, drvs, pcapctl

Location:

uspace/drv/nic

Files:

• e1k/e1k.c (modified) (1 diff)
• ne2k/ne2k.c (modified) (1 diff)
• rtl8139/driver.c (modified) (2 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -2202 +2202 @@
                 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");
+        // 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 category pcap");
-                goto err_add_to_cat;
-        }
-
+                ddf_msg(LVL_ERROR, "Failed adding function to categories");
+                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:

uspace/drv/nic/ne2k/ne2k.c

@@ -449 +449 @@
                 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;
+        }
 
         return EOK;

uspace/drv/nic/rtl8139/driver.c

@@ -42 +42 @@
 #include <stdio.h>
 #include <str.h>
+#include <pcapdump_iface.h>
 
 #include "defs.h"
@@ -1313 +1314 @@
         }
 
+        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_NOTE, "The %s device has been successfully initialized.",
             ddf_dev_get_name(dev));