diff mbox series

[4.9,07/53] sun/niu: fix wrong RXMAC_BC_FRM_CNT_COUNT count

Message ID	20210329075607.793844332@linuxfoundation.org
State	Superseded
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.9 07/53] sun/niu: fix wrong RXMAC_BC_FRM_CNT_COUNT count Date: Mon, 29 Mar 2021 09:57:42 +0200 Message-Id: <20210329075607.793844332@linuxfoundation.org> In-Reply-To: <20210329075607.561619583@linuxfoundation.org> References: <20210329075607.561619583@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.9,02/53] powerpc/4xx: Fix build errors from mfdcr() [4.9,03/53] atm: eni: dont release is never initialized [4.9,04/53] atm: lanai: dont run lanai_dev_close if not open [4.9,05/53] ixgbe: Fix memleak in ixgbe_configure_clsu32 [4.9,06/53] net: tehuti: fix error return code in bdx_probe() [4.9,07/53] sun/niu: fix wrong RXMAC_BC_FRM_CNT_COUNT count [4.9,08/53] nfs: fix PNFS_FLEXFILE_LAYOUT Kconfig default [4.9,09/53] NFS: Correct size calculation for create reply length [4.9,10/53] net: wan: fix error return code of uhdlc_init() [4.9,11/53] atm: uPD98402: fix incorrect allocation [4.9,12/53] atm: idt77252: fix null-ptr-dereference [4.9,13/53] u64_stats,lockdep: Fix u64_stats_init() vs lockdep [4.9,14/53] nfs: we dont support removing system.nfs4_acl [4.9,15/53] ia64: fix ia64_syscall_get_set_arguments() for break-based syscalls [4.9,16/53] ia64: fix ptrace(PTRACE_SYSCALL_INFO_EXIT) sign [4.9,17/53] x86/tlb: Flush global mappings when KAISER is disabled [4.9,18/53] squashfs: fix inode lookup sanity checks [4.9,19/53] squashfs: fix xattr id and id lookup sanity checks [4.9,20/53] arm64: dts: ls1043a: mark crypto engine dma coherent [4.9,21/53] bus: omap_l3_noc: mark l3 irqs as IRQF_NO_THREAD [4.9,22/53] macvlan: macvlan_count_rx() needs to be aware of preemption [4.9,23/53] net: dsa: bcm_sf2: Qualify phydev->dev_flags based on port [4.9,24/53] e1000e: add rtnl_lock() to e1000_reset_task [4.9,25/53] e1000e: Fix error handling in e1000_set_d0_lplu_state_82571 [4.9,26/53] net/qlcnic: Fix a use after free in qlcnic_83xx_get_minidump_template [4.9,27/53] can: c_can_pci: c_can_pci_remove(): fix use-after-free [4.9,28/53] can: c_can: move runtime PM enable/disable to c_can_platform [4.9,29/53] can: m_can: m_can_do_rx_poll(): fix extraneous msg loss warning [4.9,30/53] mac80211: fix rate mask reset [4.9,31/53] net: cdc-phonet: fix data-interface release on probe failure [4.9,32/53] RDMA/cxgb4: Fix adapter LE hash errors while destroying ipv6 listening server [4.9,33/53] ACPI: scan: Rearrange memory allocation in acpi_device_add() [4.9,34/53] ACPI: scan: Use unique number for instance_no [4.9,35/53] perf auxtrace: Fix auxtrace queue conflict [4.9,36/53] idr: add ida_is_empty [4.9,37/53] futex: Use smp_store_release() in mark_wake_futex() [4.9,38/53] futex,rt_mutex: Introduce rt_mutex_init_waiter() [4.9,39/53] futex: Rework futex_lock_pi() to use rt_mutex_*_proxy_lock() [4.9,40/53] futex: Drop hb->lock before enqueueing on the rtmutex [4.9,41/53] futex: Avoid freeing an active timer [4.9,42/53] futex,rt_mutex: Fix rt_mutex_cleanup_proxy_lock() [4.9,43/53] futex: Handle early deadlock return correctly [4.9,44/53] futex: Fix (possible) missed wakeup [4.9,45/53] locking/futex: Allow low-level atomic operations to return -EAGAIN [4.9,46/53] arm64: futex: Bound number of LDXR/STXR loops in FUTEX_WAKE_OP [4.9,47/53] futex: Prevent robust futex exit race [4.9,48/53] futex: Fix incorrect should_fail_futex() handling [4.9,49/53] futex: Handle transient "ownerless" rtmutex state correctly [4.9,50/53] can: dev: Move device back to init netns on owning netns delete [4.9,51/53] net: sched: validate stab values [4.9,52/53] net: qrtr: fix a kernel-infoleak in qrtr_recvmsg() [4.9,53/53] 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 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)