From 6260b86c153abfd1d4c96fa558ed20e80c6c0e4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Mon, 22 Jun 2015 12:14:07 +0300
Subject: [PATCH] eth/fetcher: fix failed merge

---
 eth/fetcher/fetcher.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eth/fetcher/fetcher.go b/eth/fetcher/fetcher.go
index a8f0dddbd..13c65121b 100644
--- a/eth/fetcher/fetcher.go
+++ b/eth/fetcher/fetcher.go
@@ -380,7 +380,7 @@ func (f *Fetcher) enqueue(peer string, block *types.Block) {
 	// Discard any past or too distant blocks
 	if dist := int64(block.NumberU64()) - int64(f.chainHeight()); dist < -maxUncleDist || dist > maxQueueDist {
 		glog.V(logger.Debug).Infof("Peer %s: discarded block #%d [%x], distance %d", peer, block.NumberU64(), hash.Bytes()[:4], dist)
-		f.discardStats.Mark(1)
+		f.discardMeter.Mark(1)
 		return
 	}
 	// Schedule the block for future importing