michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: arp: Directly send the queued pkt

Browse source 
We must send the packet without queueing it. The pkt has already
been queued for sending, once by net_if and second time in the ARP
queue. We must not queue it twice in net_if so that the statistics
of the pkt are not counted twice and the packet filter callbacks
are only called once.

Fixes #62483

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
This commit is contained in:
Jukka Rissanen 2023-09-11 17:54:13 +03:00 • committed by Carles Cufí
commit 0e5016e502
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
subsys/net/l2/ethernet/arp.c
View file

@ -514,6 +514,8 @@ static void arp_update(struct net_if *iface,
sys_slist_prepend(&arp_table, &entry->node); sys_slist_prepend(&arp_table, &entry->node);
while (!k_fifo_is_empty(&entry->pending_queue)) { while (!k_fifo_is_empty(&entry->pending_queue)) {
int ret;
pkt = k_fifo_get(&entry->pending_queue, K_FOREVER); pkt = k_fifo_get(&entry->pending_queue, K_FOREVER);
/* Set the dst in the pending packet */ /* Set the dst in the pending packet */
@ -525,7 +527,17 @@ static void arp_update(struct net_if *iface,
net_sprint_ipv4_addr(&entry->ip), net_sprint_ipv4_addr(&entry->ip),
pkt, pkt->frags); pkt, pkt->frags);
net_if_queue_tx(iface, pkt); /* We directly send the packet without first queueing it.
* The pkt has already been queued for sending, once by
* net_if and second time in the ARP queue. We must not
* queue it twice in net_if so that the statistics of
* the pkt are not counted twice and the packet filter
* callbacks are only called once.
*/
ret = net_if_l2(iface)->send(iface, pkt);
if (ret < 0) {
net_pkt_unref(pkt);
}
} }
k_mutex_unlock(&arp_mutex); k_mutex_unlock(&arp_mutex);