[net PATCH 1/1] drivers: net: ethernet: cpsw: get slave VLAN id from slave node instead of cpsw node

2013-04-15 Thread Mugunthan V N
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-l...@mimc.co.uk
Signed-off-by: Mugunthan V N mugunthan...@ti.com
---
 drivers/net/ethernet/ti/cpsw.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 80cad06..4781d3d 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -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;
-- 
1.7.9.5

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [net PATCH 1/1] drivers: net: ethernet: cpsw: get slave VLAN id from slave node instead of cpsw node

2013-04-15 Thread David Miller
From: Mugunthan V N mugunthan...@ti.com
Date: Mon, 15 Apr 2013 23:01:28 +0530

 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-l...@mimc.co.uk
 Signed-off-by: Mugunthan V N mugunthan...@ti.com

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