summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/ChangeLog.txt2
-rw-r--r--nuttx/ChangeLog5
2 files changed, 7 insertions, 0 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index b63ac9589..fa09e4eaf 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -927,3 +927,5 @@
* apps/system/cle: CLE was not returning the terminating newline character.
But reported by Max kriegleder; work-around reported by Lorenz Meier
(2015-5-23).
+ * Misc changes due to moving nuttx/net/uip/uip-arp.h to nuttx/net/arp.h
+ (2015-5-30).
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index f6d5c674a..10ace7eef 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -7385,3 +7385,8 @@
* libc/stdio/lib_snprintf.c: If the size passed to snprintf() is zero,
then snprintf() must write nothing, but instead return the size of the
buffer needed to hold the entire string. From Sami Pelkonen (2014-5-30).
+ * net/arp: Move arp related files from net/uip to net/arp. Files renamed
+ with arp_ prefix (2014-5-30).
+ * include/nuttx/net/arp.h and net/arp/arp_timer.c: Moved
+ include/nuttx/net/uip/uip-arp.h to include/nuttx/net/arp.h; moved
+ net/net_arptimer to arp/arp_timer.c. (2014-5-30).