From da310f9ad1e0fd17523111ee3fda4a330750cfb1 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Wed, 14 Feb 2018 19:05:32 +0100 Subject: [PATCH] p2p: revert rlpx attempt at discovery deadlock fix --- p2p/rlpx.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/p2p/rlpx.go b/p2p/rlpx.go index d5cff40fdb..24037ecc13 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -108,9 +108,8 @@ 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 { - if err2 := t.fd.SetWriteDeadline(time.Now().Add(discWriteTimeout)); err2 != nil { - SendItems(t.rw, discMsg, r) - } + t.fd.SetWriteDeadline(time.Now().Add(discWriteTimeout)) + SendItems(t.rw, discMsg, r) } } t.fd.Close()