]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commit
net: stmmac: skip VLAN restore when VLAN hash ops are missing
authorMichal Piekos <michal.piekos@mmpsystems.pl>
Sat, 28 Mar 2026 08:55:51 +0000 (09:55 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 1 Apr 2026 02:45:26 +0000 (19:45 -0700)
commit48b3cd69265f346f64b93064723492da46206e9b
tree3bf63da68f5a6397e0ffe92a0aebf3e2d1dc5568
parentc0fd0fe745f5e8c568d898cd1513d0083e46204a
net: stmmac: skip VLAN restore when VLAN hash ops are missing

stmmac_vlan_restore() unconditionally calls stmmac_vlan_update() when
NETIF_F_VLAN_FEATURES is set. On platforms where priv->hw->vlan (or
->update_vlan_hash) is not provided, stmmac_update_vlan_hash() returns
-EINVAL via stmmac_do_void_callback(), resulting in a spurious
"Failed to restore VLANs" error even when no VLAN filtering is in use.

Remove not needed comment.
Remove not used return value from stmmac_vlan_restore().

Tested on Orange Pi Zero 3.

Fixes: bd7ad51253a7 ("net: stmmac: Fix VLAN HW state restore")
Signed-off-by: Michal Piekos <michal.piekos@mmpsystems.pl>
Link: https://patch.msgid.link/20260328-vlan-restore-error-v4-1-f88624c530dc@mmpsystems.pl
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c