| Message ID | 20191005220518.14008-1-f.fainelli@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net: dsa: b53: Do not clear existing mirrored port mask | expand |
On Sat, 5 Oct 2019 15:05:18 -0700, Florian Fainelli <f.fainelli@gmail.com> wrote: > Clearing the existing bitmask of mirrored ports essentially prevents us > from capturing more than one port at any given time. This is clearly > wrong, do not clear the bitmask prior to setting up the new port. > > Reported-by: Hubert Feurstein <h.feurstein@gmail.com> > Fixes: ed3af5fd08eb ("net: dsa: b53: Add support for port mirroring") > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Vivien Didelot <vivien.didelot@gmail.com>
From: Florian Fainelli <f.fainelli@gmail.com> Date: Sat, 5 Oct 2019 15:05:18 -0700 > Clearing the existing bitmask of mirrored ports essentially prevents us > from capturing more than one port at any given time. This is clearly > wrong, do not clear the bitmask prior to setting up the new port. > > Reported-by: Hubert Feurstein <h.feurstein@gmail.com> > Fixes: ed3af5fd08eb ("net: dsa: b53: Add support for port mirroring") > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Applied and queued up for -stable, thanks.
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 526ba2ab66f1..cc3536315eff 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -1845,7 +1845,6 @@ int b53_mirror_add(struct dsa_switch *ds, int port, loc = B53_EG_MIR_CTL; b53_read16(dev, B53_MGMT_PAGE, loc, ®); - reg &= ~MIRROR_MASK; reg |= BIT(port); b53_write16(dev, B53_MGMT_PAGE, loc, reg);
Clearing the existing bitmask of mirrored ports essentially prevents us from capturing more than one port at any given time. This is clearly wrong, do not clear the bitmask prior to setting up the new port. Reported-by: Hubert Feurstein <h.feurstein@gmail.com> Fixes: ed3af5fd08eb ("net: dsa: b53: Add support for port mirroring") Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- drivers/net/dsa/b53/b53_common.c | 1 - 1 file changed, 1 deletion(-)