Manually fixup merge botches via direct comparison with NuttX r5447.

2026-10-26 07:03:33 +08:00 · 2013-01-11 02:14:43 -08:00
parent 48c5d63319
commit f127495caa
428 changed files with 13932 additions and 3888 deletions
@@ -123,6 +123,7 @@ static inline int ping_timeout(struct icmp_ping_s *pstate)
    {
      return TRUE;
    }
+
  return FALSE;
 }

@@ -365,6 +366,7 @@ int uip_ping(uip_ipaddr_t addr, uint16_t id, uint16_t seqno,

      uip_icmpcallbackfree(state.png_cb);
    }
+
  uip_unlock(save);

  /* Return the negated error number in the event of a failure, or the