generic: rtl8366: add cpu_port, num_ports and num_vlan_mc to struct rtl8366_smi

SVN-Revision: 21978

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
index c0374bfdd5c875943453d45f4a34a2c5528dbf27..9ed8c457324bdaf5cd5ec82089de6e57966d742c 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
@@ -25,6 +25,10 @@ struct rtl8366_smi {
        struct mii_bus          *mii_bus;
        int                     mii_irq[PHY_MAX_ADDR];
 
+       unsigned int            cpu_port;
+       unsigned int            num_ports;
+       unsigned int            num_vlan_mc;
+
        struct rtl8366_smi_ops  *ops;
 };
 

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
index 79978437379158ac38b3d2f470a4241c12f44d2a..f70744ec0f6503e679e1062eba6ff096a8ce230a 100644 (file)
--- 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)

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366s.c b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
index a8c48a975689e7cf9ec00f383cf0d7d982f89a1f..fa3f3cd652a24e1c99eb28cae71eb035d27cf21f 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366s.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
@@ -681,7 +681,7 @@ static int rtl8366s_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 < RTL8366S_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);
@@ -727,7 +727,7 @@ static int rtl8366s_mc_is_used(struct rtl8366_smi *smi, int mc_index,
        int i;
 
        *used = 0;
-       for (i = 0; i < RTL8366S_NUM_PORTS; i++) {
+       for (i = 0; i < smi->num_ports; i++) {
                int index = 0;
 
                err = smi->ops->get_mc_index(smi, i, &index);
@@ -752,7 +752,7 @@ static int rtl8366s_set_pvid(struct rtl8366_smi *smi, unsigned port,
        int i;
 
        /* Try to find an existing MC entry for this VID */
-       for (i = 0; i < RTL8366S_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;
@@ -768,7 +768,7 @@ static int rtl8366s_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 < RTL8366S_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;
@@ -793,7 +793,7 @@ static int rtl8366s_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 < RTL8366S_NUM_VLANS; i++) {
+       for (i = 0; i < smi->num_vlan_mc; i++) {
                int used;
 
                err = rtl8366s_mc_is_used(smi, i, &used);
@@ -850,19 +850,19 @@ static int rtl8366s_reset_vlan(struct rtl8366_smi *smi)
        vlanmc.member = 0;
        vlanmc.untag = 0;
        vlanmc.fid = 0;
-       for (i = 0; i < RTL8366S_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 < RTL8366S_NUM_PORTS; i++) {
-               if (i == RTL8366S_PORT_CPU)
+       for (i = 0; i < smi->num_ports; i++) {
+               if (i == smi->cpu_port)
                        continue;
 
                err = rtl8366s_set_vlan(smi, (i + 1),
-                                        (1 << i) | RTL8366S_PORT_CPU,
-                                        (1 << i) | RTL8366S_PORT_CPU,
+                                        (1 << i) | (1 << smi->cpu_port),
+                                        (1 << i) | (1 << smi->cpu_port),
                                         0);
                if (err)
                        return err;
@@ -1682,6 +1682,9 @@ static int __init rtl8366s_probe(struct platform_device *pdev)
        smi->gpio_sda = pdata->gpio_sda;
        smi->gpio_sck = pdata->gpio_sck;
        smi->ops = &rtl8366s_smi_ops;
+       smi->cpu_port = RTL8366S_PORT_NUM_CPU;
+       smi->num_ports = RTL8366S_NUM_PORTS;
+       smi->num_vlan_mc = RTL8366S_NUM_VLANS;
 
        err = rtl8366_smi_init(smi);
        if (err)