Merge branch 'dev' of github.com:alfred-bratterud/IncludeOS into dev

fwsGonzo · fwsGonzo · commit 3a335b141650 · 2017-08-22T11:47:18.000+02:00
diff --git a/src/net/tcp/tcp.cpp b/src/net/tcp/tcp.cpp
@@ -489,11 +489,12 @@ void TCP::request_offer(Connection& conn) {
   debug2("<TCP::request_offer> %s requestin offer: uw=%u rem=%u\n",
     conn.to_string().c_str(), conn.usable_window(), conn.sendq_remaining());
 
-  if (packets > 0) {
-    conn.offer(packets);
-  }
+  // Note: Must be called even if packets is 0
+  // because the connectoin is responsible for requeuing itself (see Connection::offer)
+  conn.offer(packets);
 }
 
+
 void TCP::queue_offer(Connection& conn)
 {
   if(not conn.is_queued() and conn.can_send())

Original file line number	Diff line number	Diff line change
`@@ -489,11 +489,12 @@ void TCP::request_offer(Connection& conn) {`
`489`	`489`	`debug2("<TCP::request_offer> %s requestin offer: uw=%u rem=%u\n",`
`490`	`490`	`conn.to_string().c_str(), conn.usable_window(), conn.sendq_remaining());`
`491`	`491`
`492`		`- if (packets > 0) {`
`493`		`- conn.offer(packets);`
`494`		`- }`
	`492`	`+ // Note: Must be called even if packets is 0`
	`493`	`+ // because the connectoin is responsible for requeuing itself (see Connection::offer)`
	`494`	`+ conn.offer(packets);`
`495`	`495`	`}`
`496`	`496`
	`497`	`+`
`497`	`498`	`void TCP::queue_offer(Connection& conn)`
`498`	`499`	`{`
`499`	`500`	`if(not conn.is_queued() and conn.can_send())`