From 09972a7812fedbf7394d254dba6d2520b6c9e8cd Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 28 Jan 2015 11:58:39 -0600
Subject: [PATCH] Update ChangeLog

---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d1e6eea6b5..64681f1e74 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9547,3 +9547,9 @@
 	  there are non-waiting versions of the same interfaces (like
 	  iob_tryalloc()).  The TCP read-ahead logic now uses only these non-
 	  waiting interfaces (2015-01-27).
+	* net/tcp/tcp_send_buffered.c and tcp_wrbuffer.c: Fix another deadlock
+	  condition.  tcp_write_buffer_alloc() calls sem_wait() with network
+	  locked.  That worked if CONFIG_NET_NOINTS was not defined because
+	  interrupts are automatically restored when the wait happens.  But
+	  with CONFIG_NET_NOINTS=y, the wait blocks with the network locked --
+	  bad style and also can lead to a deadlock condition (2015-01-28).