From 2d627995cf22b9a1187e4b22d430f84541904d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Sun, 7 Jun 2015 18:41:05 +0300
Subject: [PATCH] eth/downloader: fix another rebase error

---
 eth/downloader/queue.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go
index 79ddbb857..3c99efb81 100644
--- a/eth/downloader/queue.go
+++ b/eth/downloader/queue.go
@@ -230,8 +230,7 @@ func (q *queue) Reserve(p *peer, count int) *fetchRequest {
 	send := make(map[common.Hash]int)
 	skip := make(map[common.Hash]int)
 
-	capacity := p.Capacity()
-	for proc := 0; proc < space && len(send) < capacity && !q.hashQueue.Empty(); proc++ {
+	for proc := 0; proc < space && len(send) < count && !q.hashQueue.Empty(); proc++ {
 		hash, priority := q.hashQueue.Pop()
 		if p.ignored.Has(hash) {
 			skip[hash.(common.Hash)] = int(priority)
-- 
GitLab