From 7a3a11aca6c39977f3022366a3c10f21f19876a7 Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 28 Jun 2010 17:23:41 +0000 Subject: generic: rtl8366: add cpu_port, num_ports and num_vlan_mc to struct rtl8366_smi git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21978 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../generic/files/drivers/net/phy/rtl8366rb.c | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'target/linux/generic/files/drivers/net/phy/rtl8366rb.c') diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c index 7997843737..f70744ec0f 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c @@ -691,7 +691,7 @@ static int rtl8366rb_set_vlan(struct rtl8366_smi *smi, int vid, u32 member, return err; /* Try to find an existing MC entry for this VID */ - for (i = 0; i < RTL8366RB_NUM_VLANS; i++) { + for (i = 0; i < smi->num_vlan_mc; i++) { struct rtl8366_vlan_mc vlanmc; err = smi->ops->get_vlan_mc(smi, i, &vlanmc); @@ -737,7 +737,7 @@ static int rtl8366rb_mc_is_used(struct rtl8366_smi *smi, int mc_index, int i; *used = 0; - for (i = 0; i < RTL8366RB_NUM_PORTS; i++) { + for (i = 0; i < smi->num_ports; i++) { int index = 0; err = smi->ops->get_mc_index(smi, i, &index); @@ -762,7 +762,7 @@ static int rtl8366rb_set_pvid(struct rtl8366_smi *smi, unsigned port, int i; /* Try to find an existing MC entry for this VID */ - for (i = 0; i < RTL8366RB_NUM_VLANS; i++) { + for (i = 0; i < smi->num_vlan_mc; i++) { err = smi->ops->get_vlan_mc(smi, i, &vlanmc); if (err) return err; @@ -778,7 +778,7 @@ static int rtl8366rb_set_pvid(struct rtl8366_smi *smi, unsigned port, } /* We have no MC entry for this VID, try to find an empty one */ - for (i = 0; i < RTL8366RB_NUM_VLANS; i++) { + for (i = 0; i < smi->num_vlan_mc; i++) { err = smi->ops->get_vlan_mc(smi, i, &vlanmc); if (err) return err; @@ -803,7 +803,7 @@ static int rtl8366rb_set_pvid(struct rtl8366_smi *smi, unsigned port, } /* MC table is full, try to find an unused entry and replace it */ - for (i = 0; i < RTL8366RB_NUM_VLANS; i++) { + for (i = 0; i < smi->num_vlan_mc; i++) { int used; err = rtl8366rb_mc_is_used(smi, i, &used); @@ -861,19 +861,19 @@ static int rtl8366rb_reset_vlan(struct rtl8366_smi *smi) vlanmc.member = 0; vlanmc.untag = 0; vlanmc.fid = 0; - for (i = 0; i < RTL8366RB_NUM_VLANS; i++) { + for (i = 0; i < smi->num_vlan_mc; i++) { err = smi->ops->set_vlan_mc(smi, i, &vlanmc); if (err) return err; } - for (i = 0; i < RTL8366RB_NUM_PORTS; i++) { - if (i == RTL8366RB_PORT_CPU) + for (i = 0; i < smi->num_ports; i++) { + if (i == smi->cpu_port) continue; err = rtl8366rb_set_vlan(smi, (i + 1), - (1 << i) | RTL8366RB_PORT_CPU, - (1 << i) | RTL8366RB_PORT_CPU, + (1 << i) | (1 << smi->cpu_port), + (1 << i) | (1 << smi->cpu_port), 0); if (err) return err; @@ -1692,6 +1692,9 @@ static int __init rtl8366rb_probe(struct platform_device *pdev) smi->gpio_sda = pdata->gpio_sda; smi->gpio_sck = pdata->gpio_sck; smi->ops = &rtl8366rb_smi_ops; + smi->cpu_port = RTL8366RB_PORT_NUM_CPU; + smi->num_ports = RTL8366RB_NUM_PORTS; + smi->num_vlan_mc = RTL8366RB_NUM_VLANS; err = rtl8366_smi_init(smi); if (err) -- cgit v1.2.3