From patchwork Wed Jun 24 22:06:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 191712 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp240025ilg; Wed, 24 Jun 2020 15:06:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJygEhoyp3qvZYOVO4QW8aUACTEYfU4zxOjWa/56f8/kRiNduHqsfGUhMyucMFzHRkhDCigM X-Received: by 2002:a17:906:3e15:: with SMTP id k21mr28323516eji.525.1593036381409; Wed, 24 Jun 2020 15:06:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593036381; cv=none; d=google.com; s=arc-20160816; b=fpd/E1i4WJiKfSCoWYShg/dKwowCyF9j9lpscKth18Zh+mb4YFq4jlow0a9bmxmtaV 2fL4488C3+b2oav7oAfJwr3ZzSltH3Da5vn2GL1NiPNodEdTtXL6XgZrO3oDMt/Xc+dd jQiGyGZsUTQ67mHaaeuCpK7P2+3CNMCZ68JadTJrTXkQxV8oaRe1t9kcCN0bCGJ8YyVS EzzHAZZvThZG06WFgOUM389Bh1uTE4lAlfVewy8B7kl0eilWWhtMJUGxQ2dVpoVO7r4n Ynzvs+Z/3/qs1YIOp1Kn3m4fE+74SeFj4HMk4zpBW1cIj7Msc4nshMj6vvJoI6nWJUqG RjVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Q6vPaKBXFglXf14IKkiR8Lb4E8pPnttc5k3YuknDuoY=; b=OHN2+7Ggmr6ZxUMxqEA8pVhmMR1e8+TDBs5YDVwwI8g7ZcSuKD0cOwvAuK0LzUZgPf YddsFN1830bpFKNpeEj9k6S2tOtTA01S9n5Q1o8x+w5M6MnUZk9PQWsJnl4a8XuL31Rx lSHRfjFv4quAl7OVKALQmRZJWe8q7oybNWOds4qR2utsqS1xsV2hAjV8JLjWffa6hZWq w7y4YvR0+EwE9ByQqnXLArBEJj4uNkNRe9LQ6LsvZWp5/rlj/DLfBhfe6zTmOlbiZun6 eTFrNWc1vE1lh0buodjW795udxBTPPdynqeaQeVOO9w7DeYcA7xp/SFmjAv3CYqUldTw uKIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@zx2c4.com header.s=mail header.b=j6zftUIK; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ca21si6832787edb.533.2020.06.24.15.06.21; Wed, 24 Jun 2020 15:06:21 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@zx2c4.com header.s=mail header.b=j6zftUIK; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389611AbgFXWGU (ORCPT + 9 others); Wed, 24 Jun 2020 18:06:20 -0400 Received: from mail.zx2c4.com ([192.95.5.64]:37289 "EHLO mail.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389299AbgFXWGS (ORCPT ); Wed, 24 Jun 2020 18:06:18 -0400 Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTP id aab2e22f; Wed, 24 Jun 2020 21:47:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=mail; bh=KJFj0AvgPuSYF9k38/rwChLnu Yg=; b=j6zftUIKiGwR4G8Jq1wwk0xC2iXWipAY0vJqhD4aBN8qcWYFm3n78EsDE DVJjSYfw/1u7piveM3263JU48IvruOr8TmyTcnXLvK/hbd5Rn7kLbjr/Grj9nLrQ lHJGc9kX7qm0TF7JePJ6BK1pDvAI/ZGUZ9OFpAh24zMEEIucRierOGRXQrr3mXMD j3Agk9yZLbl9fnbUt/VCwu5+mGjJfAZPUaRDbaOvo833nJLmmu+RN4ZahFZ6cmVf 7QQtJlUqaRsNy3xPqNN83Y9HMw2LppTTk+xpYnsnBVXTAuexw4jweEVySxFi+CAT q1wGqtStbBtq6ayxyxvtMGphU0G9Q== Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 39b7a5a4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 24 Jun 2020 21:47:12 +0000 (UTC) From: "Jason A. Donenfeld" To: netdev@vger.kernel.org, davem@davemloft.net Cc: "Jason A. Donenfeld" Subject: [PATCH net 2/4] socionext: account for napi_gro_receive never returning GRO_DROP Date: Wed, 24 Jun 2020 16:06:04 -0600 Message-Id: <20200624220606.1390542-3-Jason@zx2c4.com> In-Reply-To: <20200624220606.1390542-1-Jason@zx2c4.com> References: <20200624220606.1390542-1-Jason@zx2c4.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The napi_gro_receive function no longer returns GRO_DROP ever, making handling GRO_DROP dead code. This commit removes that dead code. Further, it's not even clear that device drivers have any business in taking action after passing off received packets; that's arguably out of their hands. Fixes: 6570bc79c0df ("net: core: use listified Rx for GRO_NORMAL in napi_gro_receive()") Signed-off-by: Jason A. Donenfeld --- drivers/net/ethernet/socionext/netsec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.27.0 diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c index 328bc38848bb..0f366cc50b74 100644 --- a/drivers/net/ethernet/socionext/netsec.c +++ b/drivers/net/ethernet/socionext/netsec.c @@ -1044,8 +1044,9 @@ static int netsec_process_rx(struct netsec_priv *priv, int budget) skb->ip_summed = CHECKSUM_UNNECESSARY; next: - if ((skb && napi_gro_receive(&priv->napi, skb) != GRO_DROP) || - xdp_result) { + if (skb) + napi_gro_receive(&priv->napi, skb); + if (skb || xdp_result) { ndev->stats.rx_packets++; ndev->stats.rx_bytes += xdp.data_end - xdp.data; }