80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Changed the way failed packed deliveries are handled.

Browse Source
This commit is contained in:
OBattler
2022-02-20 19:37:47 +01:00
parent f80937d350
commit b18d7795f6
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/network/network.c
View File

@@ -310,20 +310,18 @@ static void
network_rx_queue(void *priv) network_rx_queue(void *priv)
{ {
int ret = 1; int ret = 1;
static netpkt_t *pkt = NULL;
netpkt_t *pkt = NULL;
if (network_rx_pause || !thread_test_mutex(network_mutex)) { if (network_rx_pause || !thread_test_mutex(network_mutex)) {
timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0 * 128.0); timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0 * 128.0);
return; return;
} }
// network_busy(1); if (pkt == NULL)
network_queue_get(0, &pkt);
network_queue_get(0, &pkt);
if ((pkt != NULL) && (pkt->len > 0)) { if ((pkt != NULL) && (pkt->len > 0)) {
network_dump_packet(pkt); network_dump_packet(pkt);
ret = net_cards[network_card].rx(pkt->priv, pkt->data, pkt->len); ret = net_cards[network_card].rx(pkt->priv, pkt->data, pkt->len);5
if (pkt->len >= 128) if (pkt->len >= 128)
timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0 * ((double) pkt->len)); timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0 * ((double) pkt->len));
else else
@@ -331,7 +329,8 @@ network_rx_queue(void *priv)
} else } else
timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0 * 128.0); timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0 * 128.0);
if (ret) if (ret)
network_queue_advance(0); pkt = NULL;
network_queue_advance(0);
/* Transmission. */ /* Transmission. */
network_queue_get(2, &pkt); network_queue_get(2, &pkt);
@@ -340,8 +339,6 @@ network_rx_queue(void *priv)
network_queue_advance(2); network_queue_advance(2);
} }
// network_busy(0);
network_wait(0); network_wait(0);
} }