From b77b7cc1e25c2045281a17b2a7530b9dab3af1bd Mon Sep 17 00:00:00 2001 From: jani Date: Mon, 23 Jun 2003 22:24:11 +0000 Subject: [PATCH] Harmful statement introduced to avoid duplicate code in eth timer and to fix the compile warning in only one place --- src/netif/etharp.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/netif/etharp.c b/src/netif/etharp.c index 1b5607ca..acc7123b 100644 --- a/src/netif/etharp.c +++ b/src/netif/etharp.c @@ -156,23 +156,16 @@ etharp_tmr(void) if ((arp_table[i].state == ETHARP_STATE_STABLE) && (arp_table[i].ctime >= ARP_MAXAGE)) { LWIP_DEBUGF(ETHARP_DEBUG, ("etharp_timer: expired stable entry %u.\n", i)); - arp_table[i].state = ETHARP_STATE_EMPTY; -#if ARP_QUEUEING - if (arp_table[i].p != NULL) { - /* remove any queued packet */ - LWIP_DEBUGF(ETHARP_DEBUG, ("etharp_timer: freeing packet queue %p.\n", i, (void *)(arp_table[i].p))); - pbuf_free(arp_table[i].p); - arp_table[i].p = NULL; - } -#endif + goto empty; } else if ((arp_table[i].state == ETHARP_STATE_PENDING) && (arp_table[i].ctime >= ARP_MAXPENDING)) { - arp_table[i].state = ETHARP_STATE_EMPTY; LWIP_DEBUGF(ETHARP_DEBUG, ("etharp_timer: expired pending entry %u.\n", i)); + empty: + arp_table[i].state = ETHARP_STATE_EMPTY; #if ARP_QUEUEING if (arp_table[i].p != NULL) { /* remove any queued packet */ - LWIP_DEBUGF(ETHARP_DEBUG, ("etharp_timer: freeing packet queue %p.\n", i, (void *)(arp_table[i].p))); + LWIP_DEBUGF(ETHARP_DEBUG, ("etharp_timer: freeing entry %u, packet queue %p.\n", i, (void *)(arp_table[i].p))); pbuf_free(arp_table[i].p); arp_table[i].p = NULL; }