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=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 EEBA6C2BB55 for ; Wed, 17 Mar 2021 01:03:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CDE4164FB9 for ; Wed, 17 Mar 2021 01:03:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232216AbhCQBCz (ORCPT ); Tue, 16 Mar 2021 21:02:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:41666 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231362AbhCQA75 (ORCPT ); Tue, 16 Mar 2021 20:59:57 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C18D764F8F; Wed, 17 Mar 2021 00:59:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615942797; bh=ORTxPdGNjAuGYhuJCMBUbSzDCD4yWRlwdRYFYikR3ZY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z7nvCYC0wD2D8K3ZDhVdEHL281A7B+UhlBM17IsQLyoYZPci18iUS9d9mCqkzHgMI 9jDF4bSWeaK75UV7nvT940BclH5rgGl4DPzCtfaJYU+xe/Lby+Lemv4u8X7hrGo64L p0uU6X9AOVuZC3DMBw+kFaqwdLpCHR3JIEcboYSDRwg+V5bQbwfpQibSlE+kKUSTc1 QBTZsxU0R/X0VFsZPCaABdQ9F8js4lp3dyspBjwOB8zxYARJkFAiGPdKPjqhwXjNIF WWdTFD8J98uqjF9o9R3vFkWozkS9Sam4sRdVDvLeTwQsnUcZyKXuyVwKIzzcdI2mwB Q8AKVWInek5LA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Denis Efremov , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 07/16] sun/niu: fix wrong RXMAC_BC_FRM_CNT_COUNT count Date: Tue, 16 Mar 2021 20:59:38 -0400 Message-Id: <20210317005948.727250-7-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210317005948.727250-1-sashal@kernel.org> References: <20210317005948.727250-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Denis Efremov [ Upstream commit 155b23e6e53475ca3b8c2a946299b4d4dd6a5a1e ] RXMAC_BC_FRM_CNT_COUNT added to mp->rx_bcasts twice in a row in niu_xmac_interrupt(). Remove the second addition. Signed-off-by: Denis Efremov Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/sun/niu.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c index fe5b0ac8c631..5bf47279f9c1 100644 --- a/drivers/net/ethernet/sun/niu.c +++ b/drivers/net/ethernet/sun/niu.c @@ -3948,8 +3948,6 @@ static void niu_xmac_interrupt(struct niu *np) mp->rx_mcasts += RXMAC_MC_FRM_CNT_COUNT; if (val & XRXMAC_STATUS_RXBCAST_CNT_EXP) mp->rx_bcasts += RXMAC_BC_FRM_CNT_COUNT; - if (val & XRXMAC_STATUS_RXBCAST_CNT_EXP) - mp->rx_bcasts += RXMAC_BC_FRM_CNT_COUNT; if (val & XRXMAC_STATUS_RXHIST1_CNT_EXP) mp->rx_hist_cnt1 += RXMAC_HIST_CNT1_COUNT; if (val & XRXMAC_STATUS_RXHIST2_CNT_EXP) -- 2.30.1