diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-06-23 19:38:10 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-06-23 19:38:10 -0600 |
| commit | 83125b53f24bb60c2076487ca1424af9b0de87da (patch) | |
| tree | 8fce55f6e5a5816914218278195b346bf8c56083 | |
| parent | 9de1aa22302e1eae4e094794266ab83b5afb79f1 (diff) | |
| download | nuttx-83125b53f24bb60c2076487ca1424af9b0de87da.tar.gz nuttx-83125b53f24bb60c2076487ca1424af9b0de87da.tar.bz2 nuttx-83125b53f24bb60c2076487ca1424af9b0de87da.zip | |
Update Changelog
| -rw-r--r-- | nuttx/ChangeLog | 11 | ||||
| -rw-r--r-- | nuttx/net/uip/uip_iobsend.c | 3 | ||||
| -rw-r--r-- | nuttx/net/uip/uip_pktsend.c | 6 |
3 files changed, 16 insertions, 4 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 2f2671c98..f774785b2 100644 --- a/nuttx/ChangeLog +++ b/nuttx/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). diff --git a/nuttx/net/uip/uip_iobsend.c b/nuttx/net/uip/uip_iobsend.c index fc1d716f3..dde2dfeb2 100644 --- a/nuttx/net/uip/uip_iobsend.c +++ b/nuttx/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. diff --git a/nuttx/net/uip/uip_pktsend.c b/nuttx/net/uip/uip_pktsend.c index c9aa2bfc9..13f7272ee 100644 --- a/nuttx/net/uip/uip_pktsend.c +++ b/nuttx/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 |