2015-04-20 21:20:05

by Vivien Didelot

Subject: [PATCH] net: dsa: mv88e6xxx: fix setup of port control 1

mv88e6xxx_setup_port_common was writing to PORT_DEFAULT_VLAN (port
offset 0x07) instead of PORT_CONTROL_1 (port offset 0x05).

Signed-off-by: Vivien Didelot <[email protected]>
---
drivers/net/dsa/mv88e6xxx.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
index 9f0c2b9..48712bd 100644
--- a/drivers/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx.c
@@ -1251,8 +1251,7 @@ int mv88e6xxx_setup_port_common(struct dsa_switch *ds, int port)
/* Port Control 1: disable trunking, disable sending
* learning messages to this port.
*/
- ret = _mv88e6xxx_reg_write(ds, REG_PORT(port), PORT_DEFAULT_VLAN,
- 0x0000);
+ ret = _mv88e6xxx_reg_write(ds, REG_PORT(port), PORT_CONTROL_1, 0x0000);
if (ret)
goto abort;

--
2.3.5

2015-04-20 23:09:31

by Andrew Lunn

Subject: Re: [PATCH] net: dsa: mv88e6xxx: fix setup of port control 1

On Mon, Apr 20, 2015 at 05:19:23PM -0400, Vivien Didelot wrote:
> mv88e6xxx_setup_port_common was writing to PORT_DEFAULT_VLAN (port
> offset 0x07) instead of PORT_CONTROL_1 (port offset 0x05).

Hi Vivien

Good catch.

> Signed-off-by: Vivien Didelot <[email protected]>

Fixes: cca8b1337541 ("net: dsa: Use mnemonics rather than register numbers")
Acked-by: Andrew Lunn <[email protected]>

Thanks
Andrew

> ---
> drivers/net/dsa/mv88e6xxx.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
> index 9f0c2b9..48712bd 100644
> --- a/drivers/net/dsa/mv88e6xxx.c
> +++ b/drivers/net/dsa/mv88e6xxx.c
> @@ -1251,8 +1251,7 @@ int mv88e6xxx_setup_port_common(struct dsa_switch *ds, int port)
> /* Port Control 1: disable trunking, disable sending
> * learning messages to this port.
> */
> - ret = _mv88e6xxx_reg_write(ds, REG_PORT(port), PORT_DEFAULT_VLAN,
> - 0x0000);
> + ret = _mv88e6xxx_reg_write(ds, REG_PORT(port), PORT_CONTROL_1, 0x0000);
> if (ret)
> goto abort;
>
> --
> 2.3.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2015-04-21 02:01:58

by David Miller

Subject: Re: [PATCH] net: dsa: mv88e6xxx: fix setup of port control 1

From: Andrew Lunn <[email protected]>
Date: Tue, 21 Apr 2015 01:05:07 +0200

> On Mon, Apr 20, 2015 at 05:19:23PM -0400, Vivien Didelot wrote:
>> mv88e6xxx_setup_port_common was writing to PORT_DEFAULT_VLAN (port
>> offset 0x07) instead of PORT_CONTROL_1 (port offset 0x05).
>
> Hi Vivien
>
> Good catch.
>
>> Signed-off-by: Vivien Didelot <[email protected]>
>
> Fixes: cca8b1337541 ("net: dsa: Use mnemonics rather than register numbers")
> Acked-by: Andrew Lunn <[email protected]>

Applied.