summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Dörfler <axeld@pinc-software.de>2009-01-19 17:40:20 (GMT)
committerAxel Dörfler <axeld@pinc-software.de>2009-01-19 17:40:20 (GMT)
commit93f76bfb7e50a7c5ed85aff643c02158dc5ad393 (patch)
tree04ddf811ecf01d13efa352319b5b24a3ef72795e
parent236ecca7dad4b630c048214a98a16613c530a119 (diff)
* Turns out the assert was wrong; since the previous buffer can be adjacent tohrev28958
the next buffer, it can also cause the new buffer to start at the same sequence as the next buffer. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28958 a95241bf-73f2-0310-859d-f6bbb57e9c96
-rw-r--r--src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp b/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp
index 7b0cecd..1db7b6c 100644
--- a/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp
+++ b/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp
@@ -162,8 +162,8 @@ BufferQueue::Add(net_buffer *buffer, tcp_sequence sequence)
}
}
- // "next" always starts after the buffer sequence
- ASSERT(next == NULL || buffer == NULL || next->sequence > sequence);
+ // "next" always starts at or after the buffer sequence
+ ASSERT(next == NULL || buffer == NULL || next->sequence >= sequence);
while (buffer != NULL && next != NULL
&& tcp_sequence(sequence + buffer->size) > next->sequence) {