Received: by 10.213.65.68 with SMTP id h4csp1818823imn; Thu, 29 Mar 2018 11:36:44 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+AF+YuZG/3mMBShYhKut3AfslEcfnHREexRMfCAAnVHBqcTMcg6RyX+ndaBgekmJN+b6FO X-Received: by 10.101.93.5 with SMTP id e5mr6425894pgr.247.1522348604562; Thu, 29 Mar 2018 11:36:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522348604; cv=none; d=google.com; s=arc-20160816; b=KG7FrNEoVGbF2TLAl75gKP0qxwjdPChyB8LlgkqQxBMSfqedDUnXpGol5q7ddN7mSA j+NdoWAdcdtRINWTwaQFg+h97nmZP9+JEHsLaZGt7iiZ5hN5VAPwXTqEwiFfZsanVb7N hWqeOoWP/cY66JLoUdeyAidfIzftLn1DSxDFLXAlu8xDJ05aMDK5jcTHRuPJ14OMBM9m RFQmXvdTno7yeHJkyCnxVjO5wdxueahRCVLgXI2s4E9lyDGix5xYZfah6oIjNRntwpNX pTX74QyJ0kfU1DV3NdUt2WpyZEJKQGpwOkkyASyODdDODmVW/V59b0bQk1AF9aOKOFdf tlrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=/9AtqQM4gNcOAF+jnX7iX5Y+5G3CJoJ6QDm9j9Gb4sA=; b=V6wWoO6UvRd4Cmf3mfRHCU+SLOpY3vh2bEL0TziurNsuaf1AwDXBhzL7mfB8F/5EXT 3hFcdT9gh2QxsG4aBBboLNrwZUoStQWkOFM+0zG4AUPwxTL39SArDzEN9hA+zOhvCQTt L2WJ7ZbzgczMFAk0Ipa7SncW++WxuHMFHe8a0uqKQSkF5hghi3Nxy+h/FcIRS/6HOAaG Nd75uIfRVZfGOrB+Gi+5OC+slEr736N39e+z3hm7/x2sKmWWm2ox5vcJaqzylzUUdp6u Cfodehz1Y4yGHTHS3nvSDaEO9CgA+ea0FuQLtx8oQbqzp818aY75tosWqqLqKeBuE9gi gKsQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v32-v6si6746713plg.105.2018.03.29.11.36.30; Thu, 29 Mar 2018 11:36:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752796AbeC2SC6 (ORCPT + 99 others); Thu, 29 Mar 2018 14:02:58 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:58372 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752147AbeC2SCz (ORCPT ); Thu, 29 Mar 2018 14:02:55 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 46DCEC22; Thu, 29 Mar 2018 18:02:55 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Camelia Groza , "David S. Miller" Subject: [PATCH 4.15 33/47] dpaa_eth: increment the RX dropped counter when needed Date: Thu, 29 Mar 2018 20:00:14 +0200 Message-Id: <20180329175731.939328400@linuxfoundation.org> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180329175729.225211114@linuxfoundation.org> References: <20180329175729.225211114@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Camelia Groza [ Upstream commit e4d1b37c17d000a3da9368a3e260fb9ea4927c25 ] Signed-off-by: Camelia Groza Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c @@ -2310,8 +2310,10 @@ static enum qman_cb_dqrr_result rx_defau skb_len = skb->len; - if (unlikely(netif_receive_skb(skb) == NET_RX_DROP)) + if (unlikely(netif_receive_skb(skb) == NET_RX_DROP)) { + percpu_stats->rx_dropped++; return qman_cb_dqrr_consume; + } percpu_stats->rx_packets++; percpu_stats->rx_bytes += skb_len;