diff mbox series

[4.4,06/33] sun/niu: fix wrong RXMAC_BC_FRM_CNT_COUNT count

Message ID	20210329075605.490105787@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Denis Efremov <efremov@linux.com>, "David S. Miller" <davem@davemloft.net>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.4 06/33] sun/niu: fix wrong RXMAC_BC_FRM_CNT_COUNT count Date: Mon, 29 Mar 2021 09:57:51 +0200 Message-Id: <20210329075605.490105787@linuxfoundation.org> In-Reply-To: <20210329075605.290845195@linuxfoundation.org> References: <20210329075605.290845195@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [4.4,02/33] powerpc/4xx: Fix build errors from mfdcr() [4.4,03/33] atm: eni: dont release is never initialized [4.4,04/33] atm: lanai: dont run lanai_dev_close if not open [4.4,05/33] net: tehuti: fix error return code in bdx_probe() [4.4,06/33] sun/niu: fix wrong RXMAC_BC_FRM_CNT_COUNT count [4.4,07/33] nfs: fix PNFS_FLEXFILE_LAYOUT Kconfig default [4.4,08/33] NFS: Correct size calculation for create reply length [4.4,09/33] atm: uPD98402: fix incorrect allocation [4.4,10/33] atm: idt77252: fix null-ptr-dereference [4.4,11/33] u64_stats,lockdep: Fix u64_stats_init() vs lockdep [4.4,12/33] nfs: we dont support removing system.nfs4_acl [4.4,13/33] ia64: fix ia64_syscall_get_set_arguments() for break-based syscalls [4.4,14/33] ia64: fix ptrace(PTRACE_SYSCALL_INFO_EXIT) sign [4.4,15/33] x86/tlb: Flush global mappings when KAISER is disabled [4.4,16/33] squashfs: fix inode lookup sanity checks [4.4,17/33] squashfs: fix xattr id and id lookup sanity checks [4.4,18/33] bus: omap_l3_noc: mark l3 irqs as IRQF_NO_THREAD [4.4,19/33] macvlan: macvlan_count_rx() needs to be aware of preemption [4.4,20/33] net: dsa: bcm_sf2: Qualify phydev->dev_flags based on port [4.4,21/33] e1000e: add rtnl_lock() to e1000_reset_task [4.4,22/33] e1000e: Fix error handling in e1000_set_d0_lplu_state_82571 [4.4,23/33] net/qlcnic: Fix a use after free in qlcnic_83xx_get_minidump_template [4.4,24/33] can: c_can_pci: c_can_pci_remove(): fix use-after-free [4.4,25/33] can: c_can: move runtime PM enable/disable to c_can_platform [4.4,26/33] can: m_can: m_can_do_rx_poll(): fix extraneous msg loss warning [4.4,27/33] mac80211: fix rate mask reset [4.4,28/33] net: cdc-phonet: fix data-interface release on probe failure [4.4,29/33] RDMA/cxgb4: Fix adapter LE hash errors while destroying ipv6 listening server [4.4,30/33] perf auxtrace: Fix auxtrace queue conflict [4.4,31/33] can: dev: Move device back to init netns on owning netns delete [4.4,32/33] net: sched: validate stab values [4.4,33/33] mac80211: fix double free in ibss_leave

Commit Message

Greg KH March 29, 2021, 7:57 a.m. UTC

From: Denis Efremov <efremov@linux.com>

[ 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 <efremov@linux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/sun/niu.c | 2 --
 1 file changed, 2 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 85f3a2c0d4dd..cc3b025ab7a7 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)