From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50BE1C3F68F for ; Sat, 25 Jan 2020 11:50:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E3DE20801 for ; Sat, 25 Jan 2020 11:50:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579953007; bh=+JzB7yLZcr3orX5CcpEDPzmjOeC1wIQbj82tn5c4h7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wlba86Ban5O5joVZDCjMQFHTMTPP7AyiYLl14mQhuptEYuXqP+619CA3tDUYC2ras 3//7NtcG1HwEczoBWbdwpgcPTPMjTkc+Km4ERw5jP9RJS9B3CJVXz85bfckpISHcRN jL19VdZKZ503kDkrftAOTIirjfVXVtarT2/1Y2p0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728900AbgAYLtK (ORCPT ); Sat, 25 Jan 2020 06:49:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:59046 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725767AbgAYLtK (ORCPT ); Sat, 25 Jan 2020 06:49:10 -0500 Received: from p977.fit.wifi.vutbr.cz (unknown [147.229.117.36]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C4B8820704; Sat, 25 Jan 2020 11:49:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579952949; bh=+JzB7yLZcr3orX5CcpEDPzmjOeC1wIQbj82tn5c4h7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=awH3P2CJz+vJA6pW+CqKpDPvP877Qtm5XvrCU3vpFArdKL3YgezxeP+8jJWfiKP1m 1bNqnUVfCjLI0GZEmYS4tYAm0ZOUskYNb2ckbXGM3uDGAXTb2Qe7G6nCJMuswV0pXO eZ65TywjGlaom0pop0tFQhEzjMvMlYdHTueL8aKA= From: Lorenzo Bianconi To: netdev@vger.kernel.org Cc: ilias.apalodimas@linaro.org, davem@davemloft.net, lorenzo.bianconi@redhat.com, brouer@redhat.com Subject: [PATCH net 2/2] net: socionext: fix xdp_result initialization in netsec_process_rx Date: Sat, 25 Jan 2020 12:48:51 +0100 Message-Id: <6c5c8394590826f4d69172cf31e95d44eae92245.1579952387.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix xdp_result initialization in netsec_process_rx in order to not increase rx counters if there is no bpf program attached to the xdp hook and napi_gro_receive returns GRO_DROP Fixes: ba2b232108d3c ("net: netsec: add XDP support") Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/socionext/netsec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c index 0e12a9856aea..56c0e643f430 100644 --- a/drivers/net/ethernet/socionext/netsec.c +++ b/drivers/net/ethernet/socionext/netsec.c @@ -942,8 +942,8 @@ static int netsec_process_rx(struct netsec_priv *priv, int budget) struct netsec_de *de = dring->vaddr + (DESC_SZ * idx); struct netsec_desc *desc = &dring->desc[idx]; struct page *page = virt_to_page(desc->addr); + u32 xdp_result = NETSEC_XDP_PASS; struct sk_buff *skb = NULL; - u32 xdp_result = XDP_PASS; u16 pkt_len, desc_len; dma_addr_t dma_handle; struct xdp_buff xdp; -- 2.21.1