Changeset 6eab537d in mainline for uspace/drv

Timestamp:

2024-03-10T09:38:44Z (19 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

e846bec

Parents:

192019f

Message:

moved to nic, fixed all except addressing

Location:

uspace/drv/nic

Files:

• e1k/e1k.c (modified) (4 diffs)
• virtio-net/virtio-net.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;

uspace/drv/nic/virtio-net/virtio-net.c

@@ -43 +43 @@
 
 #include <virtio-pci.h>
-#include "pcapdump_iface.h"
-#include "pcap_iface.h"
+#include <pcapdump_iface.h>
+
 #define NAME    "virtio-net"
 
@@ -93 +93 @@
                 if (frame) {
                         memcpy(frame->data, &hdr[1], len - sizeof(*hdr));
-                        pcapdump_packet(nic_get_pcap_iface(nic), frame->data, frame->size);
                         nic_received_frame(nic, frame);
                 } else {
@@ -353 +352 @@
         /* Copy packet data into the buffer just past the header */
         memcpy(&hdr[1], data, size);
-        pcapdump_packet(nic_get_pcap_iface(nic), data, size);
+
         /*
          * Set the descriptor, put it into the virtqueue and notify the device
@@ -433 +432 @@
             ddf_dev_get_name(dev));
 
-        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 unbind;
+        }
 
         return EOK;