]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
net: dsa: mv88e6xxx: fix 6085 frame mode masking
authorVivien Didelot <vivien.didelot@savoirfairelinux.com>
Mon, 5 Jun 2017 22:17:16 +0000 (18:17 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 6 Jun 2017 20:04:29 +0000 (16:04 -0400)
The register bits used for the frame mode were masked with DSA (0x1)
instead of the mask value (0x3) in the 6085 implementation of
port_set_frame_mode. Fix this.

Fixes: 56995cbc3540 ("net: dsa: mv88e6xxx: Refactor CPU and DSA port setup")
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/mv88e6xxx/port.c

index 360c77854f2afd13834b8a7f6194df15c26bedae..3719ece60c615a16d5abbbeedf608822a1fe876a 100644 (file)
@@ -451,7 +451,7 @@ int mv88e6085_port_set_frame_mode(struct mv88e6xxx_chip *chip, int port,
        if (err)
                return err;
 
-       reg &= ~PORT_CONTROL_FRAME_MODE_DSA;
+       reg &= ~PORT_CONTROL_FRAME_MASK;
 
        switch (mode) {
        case MV88E6XXX_FRAME_MODE_NORMAL: