Message ID | 20210722130551.2652888-1-vladimir.oltean@nxp.com |
---|---|
State | New |
Headers | show |
Series | [net] net: dsa: mv88e6xxx: silently accept the deletion of VID 0 too | expand |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Thu, 22 Jul 2021 16:05:51 +0300 you wrote: > The blamed commit modified the driver to accept the addition of VID 0 > without doing anything, but deleting that VID still fails: > > [ 32.080780] mv88e6085 d0032004.mdio-mii:10 lan8: failed to kill vid 0081/0 > > Modify mv88e6xxx_port_vlan_leave() to do the same thing as the addition. > > [...] Here is the summary with links: - [net] net: dsa: mv88e6xxx: silently accept the deletion of VID 0 too https://git.kernel.org/netdev/net/c/c92c74131a84 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 061271480e8a..448dcfb0955f 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -2176,7 +2176,7 @@ static int mv88e6xxx_port_vlan_leave(struct mv88e6xxx_chip *chip, int i, err; if (!vid) - return -EOPNOTSUPP; + return 0; err = mv88e6xxx_vtu_get(chip, vid, &vlan); if (err)
The blamed commit modified the driver to accept the addition of VID 0 without doing anything, but deleting that VID still fails: [ 32.080780] mv88e6085 d0032004.mdio-mii:10 lan8: failed to kill vid 0081/0 Modify mv88e6xxx_port_vlan_leave() to do the same thing as the addition. Fixes: b8b79c414eca ("net: dsa: mv88e6xxx: Fix adding vlan 0") Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> --- drivers/net/dsa/mv88e6xxx/chip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)