From patchwork Wed May 27 12:19:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 477098 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AD6341402C8 for ; Wed, 27 May 2015 22:32:25 +1000 (AEST) Received: from localhost ([::1]:53643 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxaVT-0004Zw-SC for incoming@patchwork.ozlabs.org; Wed, 27 May 2015 08:32:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxaN8-00061G-7X for qemu-devel@nongnu.org; Wed, 27 May 2015 08:23:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxaN3-0002sd-2v for qemu-devel@nongnu.org; Wed, 27 May 2015 08:23:46 -0400 Received: from smtp2-g21.free.fr ([212.27.42.2]:28115) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxaN2-0002sR-Td for qemu-devel@nongnu.org; Wed, 27 May 2015 08:23:41 -0400 Received: from localhost.localdomain (unknown [82.227.227.196]) by smtp2-g21.free.fr (Postfix) with ESMTP id 1DDE04B0257; Wed, 27 May 2015 14:22:02 +0200 (CEST) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Wed, 27 May 2015 14:19:59 +0200 Message-Id: <1432729200-5322-17-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1432729200-5322-1-git-send-email-hpoussin@reactos.org> References: <1432729200-5322-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 212.27.42.2 Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Leon Alrae , Aurelien Jarno Subject: [Qemu-devel] [PATCH v2 16/17] net/dp8393x: repair can_receive() method X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Datasheet clearly says that RXDIS flag prevents reception, but says nothing about a required presence of RXEN flag. While at it, fix the style of the following if statement. Signed-off-by: Hervé Poussineau --- hw/net/dp8393x.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 95a4d3d..b81036a 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -622,10 +622,12 @@ static int dp8393x_can_receive(NetClientState *nc) { dp8393xState *s = qemu_get_nic_opaque(nc); - if (!(s->regs[SONIC_CR] & SONIC_CR_RXEN)) + if (s->regs[SONIC_CR] & SONIC_CR_RXDIS) { return 0; - if (s->regs[SONIC_ISR] & SONIC_ISR_RBE) + } + if (s->regs[SONIC_ISR] & SONIC_ISR_RBE) { return 0; + } return 1; }