lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 366/849] net: dsa: rtl8366: Fix a bug in deleting VLANs
    Date
    From: Linus Walleij <linus.walleij@linaro.org>

    [ Upstream commit d8251b9db34a2cbc5619b610e7e8aad1d165c531 ]

    We were checking that the MC (member config) was != 0
    for some reason, all we need to check is that the config
    has no ports, i.e. no members. Then it can be recycled.
    This must be some misunderstanding.

    Fixes: 4ddcaf1ebb5e ("net: dsa: rtl8366: Properly clear member config")
    Cc: Mauri Sandberg <sandberg@mailfence.com>
    Cc: DENG Qingfang <dqfext@gmail.com>
    Reviewed-by: Alvin Šipraga <alsi@bang-olufsen.dk>
    Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
    Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/dsa/rtl8366.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/rtl8366.c
    index 75897a3690969..ffbe5b6b2655b 100644
    --- a/drivers/net/dsa/rtl8366.c
    +++ b/drivers/net/dsa/rtl8366.c
    @@ -457,7 +457,7 @@ int rtl8366_vlan_del(struct dsa_switch *ds, int port,
    * anymore then clear the whole member
    * config so it can be reused.
    */
    - if (!vlanmc.member && vlanmc.untag) {
    + if (!vlanmc.member) {
    vlanmc.vid = 0;
    vlanmc.priority = 0;
    vlanmc.fid = 0;
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-15 23:56    [W:2.047 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site