Commit 91c4166c authored Apr 15, 2013 by Mugunthan V N Committed by David S. Miller Apr 15, 2013

drivers: net: ethernet: cpsw: get slave VLAN id from slave node instead of cpsw node



Dual EMAC slave VLAN id must be got from slave node instead of cpsw node as
VLAN id for each slave will be different.

Reported-by: Mark Jackson <mpfj-list@mimc.co.uk>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent ee40a116

drivers/net/ethernet/ti/cpsw.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1380,7 +1380,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
		memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN);

		if (data->dual_emac) {
		if (of_property_read_u32(node, "dual_emac_res_vlan",
		if (of_property_read_u32(slave_node, "dual_emac_res_vlan",
		&prop)) {
		pr_err("Missing dual_emac_res_vlan in DT.\n");
		slave_data->dual_emac_res_vlan = i+1;