From 411b9a9cdfe7d5044aa4c312a2a21884a5b44994 Mon Sep 17 00:00:00 2001
From: Anton Evangelatov <anton.evangelatov@gmail.com>
Date: Wed, 14 Feb 2018 14:14:25 +0100
Subject: [PATCH] p2p: trying to fix deadlock on discovery tests

---
 p2p/rlpx.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/p2p/rlpx.go b/p2p/rlpx.go
index 24037ecc13..d5cff40fdb 100644
--- a/p2p/rlpx.go
+++ b/p2p/rlpx.go
@@ -108,8 +108,9 @@ func (t *rlpx) close(err error) {
 	// Tell the remote end why we're disconnecting if possible.
 	if t.rw != nil {
 		if r, ok := err.(DiscReason); ok && r != DiscNetworkError {
-			t.fd.SetWriteDeadline(time.Now().Add(discWriteTimeout))
-			SendItems(t.rw, discMsg, r)
+			if err2 := t.fd.SetWriteDeadline(time.Now().Add(discWriteTimeout)); err2 != nil {
+				SendItems(t.rw, discMsg, r)
+			}
 		}
 	}
 	t.fd.Close()