summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-11-15 10:25:30 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-11-15 10:25:30 -0600
commitcf1c261a3dccb0f1ab7c98f1ad3900417b1d8262 (patch)
tree5d3a0f285dcebb1cff3c1f1798528f8db81842db
parentd488dd59e8a1fcbef2d8e6cfc19da05c9bed6f5a (diff)
parenta20115c1c019b98d70ae25a62260126b21486bd0 (diff)
downloadnuttx-cf1c261a3dccb0f1ab7c98f1ad3900417b1d8262.tar.gz
nuttx-cf1c261a3dccb0f1ab7c98f1ad3900417b1d8262.tar.bz2
nuttx-cf1c261a3dccb0f1ab7c98f1ad3900417b1d8262.zip
Merge remote-tracking branch 'origin/master' into llhdrlen
-rwxr-xr-xnuttx/ChangeLog5
1 files changed, 4 insertions, 1 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index e7f74c7c1..1e8b23d7a 100755
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -8981,4 +8981,7 @@
logic commited yesterday (2014-11-15).
* configs/stm32f4discovery/netnsh/defconfig: Needs to set MAC address
(2014-11-15).
-
+ * arch/ and drivers/: Remove use of NET_LL_HDRLEN from Ethernet drivers.
+ Use ETH_HDRLEN instead (2014-11-15).
+ * net/arp/: Remove use of NET_LL_HDRLEN from net/arp logic. Use
+ ETH_HDRLEN instead (2014-11-15).