From patchwork Thu Oct 24 17:24:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 1183390 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="e5bgRuvV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46zYzH6CXyz9sQv for ; Fri, 25 Oct 2019 04:25:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2503747AbfJXRZM (ORCPT ); Thu, 24 Oct 2019 13:25:12 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:22790 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2503737AbfJXRZM (ORCPT ); Thu, 24 Oct 2019 13:25:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571937911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eP2BoDS+qKrOlRNhNKzclArVzVRVn8mElyDMenO637o=; b=e5bgRuvVmvf9LboseYmdCtWRVU7qNcLnO0AOIPgltsqYgcPl2NC7MkXxT7wykYdf6IGsNM ZMung0BJ3LmUpYwmz5FFRizZSM+zbbeQwboWDsoBLs6FiudImDvzQvYAZ5INEdKteTwZyX c8pUzBMjijn/Jl3D1f20dNPFQicq5zs= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-320-eaXsN3joOwG6XWbpwO4mUw-1; Thu, 24 Oct 2019 13:25:09 -0400 Received: by mail-wr1-f71.google.com with SMTP id h4so13213562wrx.15 for ; Thu, 24 Oct 2019 10:25:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sEHK/Mm+/W2s4S1uZhkuoDS67kM3geWIeg5D1P9O+N8=; b=lPMvy7pzNrm5oSt8Lh23K/XJZu77dUuXkLdVOcUXSQ1s2XnjVMlD5e5Hj9yYPoA2Dw WBPleCmp8ls7Xxaab+mbKdWe5H5cLbC9pAjcHRRWOV/FRDIBGiD/7fjOdainCVXt2rPh 9kTa4d9R4OiQnSSivqAmaEmAnQSvFTOGgO2QCLGnw/Fijiyc2e9WwZrNmOCkKbng25NL xiRtMHy3RHuKdcdA1j3EPj00VojDTvRooJGD9cAJ+dpjD5gUVB3mi5OunWQZqCQLsKfM aJeUadobvWVq0mFJpmw5hmJaB+5mIoyXjD6UzfSUqH3bGXRcb9VfChfPBhjP72UXAEyU U36w== X-Gm-Message-State: APjAAAXCbuWS75IKAQLgWGFFCh3uVZBxNmm6SNhLZCWhVYXQz1MBbtn6 xPNDBcCvsiADEmH0GaOpsIflRrfcQNG5CaqBayVDF+VSZ9vSA6ubuLHVJ3fXxDyfU5NQFTRE4YK g6sx6r93EiDHDV6ZF X-Received: by 2002:adf:fec3:: with SMTP id q3mr4844750wrs.343.1571937907941; Thu, 24 Oct 2019 10:25:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqw+10+EuLZ+rBVSTixGZLcQx5XS8FxFqlBPvpQbaowcsIkiyMX0FX0F2OQ+sQ4I41O86D0+1g== X-Received: by 2002:adf:fec3:: with SMTP id q3mr4844734wrs.343.1571937907744; Thu, 24 Oct 2019 10:25:07 -0700 (PDT) Received: from mcroce-redhat.mxp.redhat.com (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id 200sm4253443wme.32.2019.10.24.10.25.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2019 10:25:07 -0700 (PDT) From: Matteo Croce To: netdev@vger.kernel.org Cc: "David S. Miller" , Antoine Tenart , Maxime Chevallier , Marcin Wojtas , Stefan Chulski , linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 1/3] mvpp2: refactor frame drop routine Date: Thu, 24 Oct 2019 19:24:56 +0200 Message-Id: <20191024172458.7956-2-mcroce@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191024172458.7956-1-mcroce@redhat.com> References: <20191024172458.7956-1-mcroce@redhat.com> MIME-Version: 1.0 X-MC-Unique: eaXsN3joOwG6XWbpwO4mUw-1 X-Mimecast-Spam-Score: 0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move some code down to remove a backward goto. Signed-off-by: Matteo Croce --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 111b3b8239e1..33f327447b70 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -2957,14 +2957,8 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi, * by the hardware, and the information about the buffer is * comprised by the RX descriptor. */ - if (rx_status & MVPP2_RXD_ERR_SUMMARY) { -err_drop_frame: - dev->stats.rx_errors++; - mvpp2_rx_error(port, rx_desc); - /* Return the buffer to the pool */ - mvpp2_bm_pool_put(port, pool, dma_addr, phys_addr); - continue; - } + if (rx_status & MVPP2_RXD_ERR_SUMMARY) + goto err_drop_frame; if (bm_pool->frag_size > PAGE_SIZE) frag_size = 0; @@ -2995,6 +2989,13 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi, mvpp2_rx_csum(port, rx_status, skb); napi_gro_receive(napi, skb); + continue; + +err_drop_frame: + dev->stats.rx_errors++; + mvpp2_rx_error(port, rx_desc); + /* Return the buffer to the pool */ + mvpp2_bm_pool_put(port, pool, dma_addr, phys_addr); } if (rcvd_pkts) {