Changeset 9eb21d1 in mainline for uspace/drv

Timestamp:

2024-12-13T08:32:55Z (10 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

a270026

Parents:

17a8fcf

git-author:

Nataliia Korop <n.corop08@…> (2023-12-19 14:05:46)

git-committer:

Nataliia Korop <n.corop08@…> (2024-12-13 08:32:55)

Message:

pcapdump moved to nic_t struct

File:

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

uspace/drv/nic/e1k/e1k.c

@@ -177 +177 @@
         fibril_mutex_t eeprom_lock;
 
-        /** Interface for dumping packets */
-        pcap_iface_t pcapdump;
 
 } e1000_t;
@@ -1195 +1193 @@
                 if (frame != NULL) {
                         memcpy(frame->data, e1000->rx_frame_virt[next_tail], frame_size);
-                        pcapdump_packet(&e1000->pcapdump, frame->data, frame->size);
+                        pcapdump_packet(nic_get_pcap_iface(nic), frame->data, frame->size);
 
                         nic_received_frame(nic, frame);
@@ -2210 +2208 @@
                 goto err_add_to_cat;
 
-        errno_t pcap_rc  = pcapdump_init(&e1000->pcapdump);
+        errno_t pcap_rc  = pcapdump_init(nic_get_pcap_iface(nic));
 
         if (pcap_rc != EOK) {
@@ -2382 +2380 @@
 
         memcpy(e1000->tx_frame_virt[tdt], data, size);
-        pcapdump_packet(&e1000->pcapdump, 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;