From 75e134261f6124c44b6dd32d7ba8e57af53a4419 Mon Sep 17 00:00:00 2001 From: Wei Fang Date: Mon, 20 Jul 2026 09:43:11 +0800 Subject: [PATCH] net: enetc: open-code enetc4_set_default_si_vlan_promisc() The function enetc4_set_default_si_vlan_promisc() is only called once, from enetc4_configure_port_si(). Open-code the loop at the call site and remove the single-use wrapper. Signed-off-by: Wei Fang Reviewed-by: Joe Damato Link: https://patch.msgid.link/20260720014317.1059359-10-wei.fang@oss.nxp.com Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/freescale/enetc/enetc4_pf.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c index 859b02f5170a..505e4abf6c37 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c +++ b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c @@ -307,17 +307,6 @@ static void enetc4_pf_set_si_vlan_promisc(struct enetc_hw *hw, int si, bool en) enetc_port_wr(hw, ENETC4_PSIPVMR, val); } -static void enetc4_set_default_si_vlan_promisc(struct enetc_pf *pf) -{ - struct enetc_hw *hw = &pf->si->hw; - int num_si = pf->caps.num_vsi + 1; - int i; - - /* enforce VLAN promiscuous mode for all SIs */ - for (i = 0; i < num_si; i++) - enetc4_pf_set_si_vlan_promisc(hw, i, true); -} - /* Allocate the number of MSI-X vectors for per SI. */ static void enetc4_set_si_msix_num(struct enetc_pf *pf) { @@ -361,7 +350,9 @@ static void enetc4_configure_port_si(struct enetc_pf *pf) /* Outer VLAN tag will be used for VLAN filtering */ enetc_port_wr(hw, ENETC4_PSIVLANFMR, PSIVLANFMR_VS); - enetc4_set_default_si_vlan_promisc(pf); + /* Enforce VLAN promiscuous mode for all SIs */ + for (int i = 0; i < pf->caps.num_vsi + 1; i++) + enetc4_pf_set_si_vlan_promisc(hw, i, true); /* Disable SI MAC multicast & unicast promiscuous */ enetc_port_wr(hw, ENETC4_PSIPMMR, 0);