summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-07-23 11:31:39 -0700
committerDavid S. Miller <davem@davemloft.net>2013-07-23 11:31:39 -0700
commit135529b443631f840cc66d0cc395f79c416434d9 (patch)
tree3a845cb4b3f95e301f1f551c317d485ed756f1cf /nptl
parent7b1f8b581f9387230788e4d8a67cdbcf464dac85 (diff)
downloadglibc-135529b443631f840cc66d0cc395f79c416434d9.tar.gz
glibc-135529b443631f840cc66d0cc395f79c416434d9.tar.xz
glibc-135529b443631f840cc66d0cc395f79c416434d9.zip
Remove Linux kernel version ambiguity in comment added by previous commit.
	* tst-cancel4.c (WRITE_BUFFER_SIZE): Adjust comment.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog4
-rw-r--r--nptl/tst-cancel4.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 0e4747e789..eae507965f 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-23  David S. Miller  <davem@davemloft.net>
+
+	* tst-cancel4.c (WRITE_BUFFER_SIZE): Adjust comment.
+
 2013-07-22  David S. Miller  <davem@davemloft.net>
 
 	* tst-cancel4.c (WRITE_BUFFER_SIZE): Increase to 16384.
diff --git a/nptl/tst-cancel4.c b/nptl/tst-cancel4.c
index 10b7c6e1b0..6d25e48f1c 100644
--- a/nptl/tst-cancel4.c
+++ b/nptl/tst-cancel4.c
@@ -87,8 +87,8 @@ static pthread_barrier_t b2;
    the socket send buffer size to '1', a write of this size on that
    socket will block.
 
-   The Linux kernel imposes a minimum send socket buffer size
-   which has changed over the years.  Currently the value is:
+   The Linux kernel imposes a minimum send socket buffer size which
+   has changed over the years.  As of Linux 3.10 the value is:
 
      2 * (2048 + SKB_DATA_ALIGN(sizeof(struct sk_buff)))