Commit 7fa4fe3b authored by Michael Chan's avatar Michael Chan Committed by sanglipeng1
Browse files

bnxt_en: Remove mis-applied code from bnxt_cfg_ntp_filters() 

stable inclusion
from stable-v5.10.208
commit 701b03fc14f79a5afd88d853c8425ab9fd933d47
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9T22K

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=701b03fc14f79a5afd88d853c8425ab9fd933d47



--------------------------------

[ Upstream commit e009b2efb7a8850498796b360043ac25c8d3d28f ]

The 2 lines to check for the BNXT_HWRM_PF_UNLOAD_SP_EVENT bit was
mis-applied to bnxt_cfg_ntp_filters() and should have been applied to
bnxt_sp_task().

Fixes: 19241368 ("bnxt_en: Send PF driver unload notification to all VFs.")
Reviewed-by: default avatarAndy Gospodarek <andrew.gospodarek@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent 8e1350d5

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+2 −2
Original line number Diff line number Diff line
@@ -11143,6 +11143,8 @@ static void bnxt_sp_task(struct work_struct *work) 
		bnxt_cfg_ntp_filters(bp);

	if (test_and_clear_bit(BNXT_HWRM_EXEC_FWD_REQ_SP_EVENT, &bp->sp_event))

		bnxt_hwrm_exec_fwd_req(bp);

	if (test_and_clear_bit(BNXT_HWRM_PF_UNLOAD_SP_EVENT, &bp->sp_event))

		netdev_info(bp->dev, "Receive PF driver unload event!\n");

	if (test_and_clear_bit(BNXT_PERIODIC_STATS_SP_EVENT, &bp->sp_event)) {

		bnxt_hwrm_port_qstats(bp, 0);

		bnxt_hwrm_port_qstats_ext(bp, 0);
@@ -12097,8 +12099,6 @@ static void bnxt_cfg_ntp_filters(struct bnxt *bp) 
			}

		}

	}

	if (test_and_clear_bit(BNXT_HWRM_PF_UNLOAD_SP_EVENT, &bp->sp_event))

		netdev_info(bp->dev, "Receive PF driver unload event!\n");

}



#else