From bb359ff3945cbf9d28675eb9330ac1aab11ddd29 Mon Sep 17 00:00:00 2001 From: OBattler Date: Thu, 30 Apr 2020 01:19:01 +0200 Subject: [PATCH] Got rid of an unnecessary memcpy() in the network queue code. --- src/network/network.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/network/network.c b/src/network/network.c index 2e9fee693..b3eb95201 100644 --- a/src/network/network.c +++ b/src/network/network.c @@ -240,16 +240,12 @@ network_queue_put(void *priv, uint8_t *data, int len) static void -network_queue_get(netpkt_t *pkt) +network_queue_get(netpkt_t **pkt) { - pkt->priv = NULL; - pkt->data = NULL; - pkt->len = 0; - if (first_pkt == NULL) - return; - - memcpy(pkt, first_pkt, sizeof(netpkt_t)); + *pkt = NULL; + else + *pkt = first_pkt; } @@ -295,15 +291,15 @@ network_queue_clear(void) static void network_queue(void *priv) { - netpkt_t pkt; + netpkt_t *pkt = NULL; network_busy(1); network_queue_get(&pkt); - if (pkt.len > 0) { - net_cards[network_card].rx(pkt.priv, pkt.data, pkt.len); - if (pkt.len >= 128) - timer_on_auto(&network_queue_timer, 0.762939453125 * 2.0 * ((double) pkt.len)); + if ((pkt != NULL) && (pkt->len > 0)) { + net_cards[network_card].rx(pkt->priv, pkt->data, pkt->len); + if (pkt->len >= 128) + timer_on_auto(&network_queue_timer, 0.762939453125 * 2.0 * ((double) pkt->len)); else timer_on_auto(&network_queue_timer, 0.762939453125 * 2.0 * 128.0); } else