| Message ID | 20210925132311.2040272-6-linus.walleij@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | RTL8366(RB) cleanups part 1 | expand |
On 9/25/21 3:23 PM, Linus Walleij wrote: > We were checking that the MC (member config) was != 0 Minor nitpick: actually we were checking the untag mask != 0, right? The change itself seems fine though: Reviewed-by: Alvin Šipraga <alsi@bang-olufsen.dk> > 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: Vladimir Oltean <olteanv@gmail.com> > Cc: Mauri Sandberg <sandberg@mailfence.com> > Cc: Alvin Šipraga <alsi@bang-olufsen.dk> > Cc: Florian Fainelli <f.fainelli@gmail.com> > Cc: DENG Qingfang <dqfext@gmail.com> > Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > ChangeLog v5->v6: > - No changes just resending with the rest of the > patches. > ChangeLog v4->v5: > - Collect Florians review tag > - Add Fixes tag > ChangeLog v1->v4: > - New patch for a bug found while fixing the other issues. > --- > 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 0672dd56c698..f815cd16ad48 100644 > --- a/drivers/net/dsa/rtl8366.c > +++ b/drivers/net/dsa/rtl8366.c > @@ -374,7 +374,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; >
On Sat, Sep 25, 2021 at 03:23:10PM +0200, Linus Walleij wrote: > 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: Vladimir Oltean <olteanv@gmail.com> > Cc: Mauri Sandberg <sandberg@mailfence.com> > Cc: Alvin Šipraga <alsi@bang-olufsen.dk> > Cc: Florian Fainelli <f.fainelli@gmail.com> > Cc: DENG Qingfang <dqfext@gmail.com> > Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- Reviewed-by: Vladimir Oltean <olteanv@gmail.com> but bug fixes should go to the "net" tree and from there towards "stable". At the very least they should be the first patches in a series.
diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/rtl8366.c index 0672dd56c698..f815cd16ad48 100644 --- a/drivers/net/dsa/rtl8366.c +++ b/drivers/net/dsa/rtl8366.c @@ -374,7 +374,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;
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: Vladimir Oltean <olteanv@gmail.com> Cc: Mauri Sandberg <sandberg@mailfence.com> Cc: Alvin Šipraga <alsi@bang-olufsen.dk> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: DENG Qingfang <dqfext@gmail.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- ChangeLog v5->v6: - No changes just resending with the rest of the patches. ChangeLog v4->v5: - Collect Florians review tag - Add Fixes tag ChangeLog v1->v4: - New patch for a bug found while fixing the other issues. --- drivers/net/dsa/rtl8366.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.31.1