Re: [PATCH net 05/12] net: systemport: Fix Wake-on-LAN RXCHK filter enable loop

[Nicolai Buchwitz <nb@tipi-net.de>]

On 22.9.2026 01:12, Florian Fainelli wrote:
> In bcm_sysport_suspend_to_wol(), the loop enabling programmed RXCHK
> filters in RXCHK_CONTROL used an auxiliary counter 'i' instead of the
> actual set filter index 'index'.
> 
> When non-contiguous filters were configured (for example, if filter 0
> was deleted and filter 1 remained), the code would enable bit
> (RXCHK_BRCM_TAG_MATCH_SHIFT + 0) corresponding to filter 0 rather than
> filter 1, causing Wake-on-LAN filter matching to fail.
> 
> Fix this by using the filter 'index' to set the appropriate match bit
> in RXCHK_CONTROL.
> 
> Fixes: bb9051a2b230 ("net: systemport: Add support for WAKE_FILTER")
> Assisted-by: LLM
> Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
> ---
>  drivers/net/ethernet/broadcom/bcmsysport.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c 
> b/drivers/net/ethernet/broadcom/bcmsysport.c
> index 78b96b192185..7f2e5e4efb8d 100644
> --- a/drivers/net/ethernet/broadcom/bcmsysport.c
> +++ b/drivers/net/ethernet/broadcom/bcmsysport.c
> @@ -2652,7 +2652,7 @@ static int bcm_sysport_suspend_to_wol(struct 
> bcm_sysport_priv *priv)
>  {
>  	struct net_device *ndev = priv->netdev;
>  	unsigned int timeout = 1000;
> -	unsigned int index, i = 0;
> +	unsigned int index;
>  	u32 reg;
> 
>  	reg = umac_readl(priv, UMAC_MPD_CTRL);
> @@ -2682,10 +2682,8 @@ static int bcm_sysport_suspend_to_wol(struct 
> bcm_sysport_priv *priv)
>  		reg = rxchk_readl(priv, RXCHK_CONTROL);
>  		reg &= ~(RXCHK_BRCM_TAG_MATCH_MASK <<
>  			 RXCHK_BRCM_TAG_MATCH_SHIFT);
> -		for_each_set_bit(index, priv->filters, RXCHK_BRCM_TAG_MAX) {
> -			reg |= BIT(RXCHK_BRCM_TAG_MATCH_SHIFT + i);
> -			i++;
> -		}
> +		for_each_set_bit(index, priv->filters, RXCHK_BRCM_TAG_MAX)
> +			reg |= BIT(RXCHK_BRCM_TAG_MATCH_SHIFT + index);
>  		reg |= RXCHK_EN | RXCHK_BRCM_TAG_EN;
>  		rxchk_writel(priv, reg, RXCHK_CONTROL);
>  	}

Reviewed-by: Nicolai Buchwitz <nb@tipi-net.de>

Thanks,
Nicolai