Update Changelog

ChangeLog

@@ -7475,4 +7475,13 @@
 	* arch/arm/src/lpc17xx and configs/lpcexpresso-lpc1768:  Added support
 	  for the lpcxpresso's rtc handler, adc, dac, timers, pwm and mcpwm
 	  drivers.  From Max (himax) (2014-6-23).
-
+	* net/tcp/Kconfig:  Cannot enable bother TCP write buffering AND raw
+	  packet sockets.  This should not logically be the case, but is because
+	  the implementations are presently too coupled.  The logic packet
+	  socket logic in net/net_send_unbuffered.c needs to be broken out into
+	  a separate file so that write buffered TCP and packet socket transfers
+	  can co-exist (2014-6-23).
+	* net/uip/uip_pktsend.c:  Move the logic that copies data into the
+	  device buffer from net/net_send_unbuffered.c to net/uip/uip_pktsend.c.
+	  This makes the packet socket design more consistent with TCP and UDP
+	  (2014-6-23).

net/uip/uip_iobsend.c

@@ -88,6 +88,9 @@
  *   Called from socket logic in response to a xmit or poll request from the
  *   the network interface driver.
  *
+ *   This is identical to calling uip_send() except that the data is
+ *   in an I/O buffer chain, rather than a flat buffer.
+ *
  * Assumptions:
  *   Called from the interrupt level or, at a minimum, with interrupts
  *   disabled.

net/uip/uip_pktsend.c

@@ -87,9 +87,9 @@
  *   Called from socket logic in order to send a raw packet in response to
  *   an xmit or poll request from the the network interface driver.
  *
- * This is almost identical to calling uip_send() except that the data to
- * be sent is copied into dev->d_buf (vs. dev->d_snddata), since there is
- * no header on the data.
+ *   This is almost identical to calling uip_send() except that the data to
+ *   be sent is copied into dev->d_buf (vs. dev->d_snddata), since there is
+ *   no header on the data.
  *
  * Assumptions:
  *   Called from the interrupt level or, at a minimum, with interrupts