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

Timestamp:

2024-03-10T10:46:00Z (2 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

e4cc266

Parents:

325ea9c (diff), 6eab537d (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.

Message:

Merge branch 'topic/packet-capture' into topic/packet-capture-list

File:

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

uspace/drv/nic/e1k/e1k.c

@@ -49 +49 @@
 #include <nic.h>
 #include <ops/nic.h>
+#include <pcapdump_iface.h>
 #include "e1k.h"
 
-#include "pcapdump_iface.h"
-#include "pcap_iface.h"
 #define NAME  "e1k"
 
@@ -1192 +1191 @@
                 if (frame != NULL) {
                         memcpy(frame->data, e1000->rx_frame_virt[next_tail], frame_size);
-                        pcapdump_packet(nic_get_pcap_iface(nic), frame->data, frame->size);
 
                         nic_received_frame(nic, frame);
@@ -2208 +2206 @@
                 goto err_add_to_cat;
 
-        errno_t pcap_rc  = pcapdump_init(nic_get_pcap_iface(nic));
-
-        if (pcap_rc != EOK) {
-                printf("Failed creating pcapdump port\n");
-        }
         rc = ddf_fun_add_to_category(fun, "pcap");
-        if (rc != EOK)
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding function to category pcap");
                 goto err_add_to_cat;
+        }
 
         return EOK;
@@ -2380 +2375 @@
 
         memcpy(e1000->tx_frame_virt[tdt], data, size);
-        pcapdump_packet(nic_get_pcap_iface(nic), data, size);
         tx_descriptor_addr->phys_addr = PTR_TO_U64(e1000->tx_frame_phys[tdt]);
         tx_descriptor_addr->length = size;