diff mbox

net: dsa: mv88e6xxx: fix setup of port control 1

Message ID 1429564763-10098-1-git-send-email-vivien.didelot@savoirfairelinux.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Vivien Didelot April 20, 2015, 9:19 p.m. UTC
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 <vivien.didelot@savoirfairelinux.com>
---
 drivers/net/dsa/mv88e6xxx.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Andrew Lunn April 20, 2015, 11:05 p.m. UTC | #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 <vivien.didelot@savoirfairelinux.com>

Fixes: cca8b1337541 ("net: dsa: Use mnemonics rather than register numbers")
Acked-by: Andrew Lunn <andrew@lunn.ch>

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 majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller April 21, 2015, 2:01 a.m. UTC | #2
From: Andrew Lunn <andrew@lunn.ch>
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 <vivien.didelot@savoirfairelinux.com>
> 
> Fixes: cca8b1337541 ("net: dsa: Use mnemonics rather than register numbers")
> Acked-by: Andrew Lunn <andrew@lunn.ch>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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;