diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-07-15 13:05:43 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-07-15 13:05:43 +0000 |
| commit | 4bcb729a13df5c821c069d7b13b53818be7cbf4d (patch) | |
| tree | fb32710a68ced59ceb1defe3c6a3a625eec4772d | |
| parent | fc85856afdb9f7c007e733f7fa409a434d2706a7 (diff) | |
generic: rtl8366: use smi->num_ports and smi->ops->get_vlan_4k
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22202 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic/files/drivers/net/phy/rtl8366rb.c | 8 | ||||
| -rw-r--r-- | target/linux/generic/files/drivers/net/phy/rtl8366s.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c index 2efde1df3f..ae976f45b2 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c @@ -721,14 +721,14 @@ static int rtl8366rb_sw_get_vlan_info(struct switch_dev *dev, memset(buf, '\0', sizeof(smi->buf)); - err = rtl8366rb_get_vlan_4k(smi, val->port_vlan, &vlan4k); + err = smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k); if (err) return err; len += snprintf(buf + len, sizeof(smi->buf) - len, "VLAN %d: Ports: '", vlan4k.vid); - for (i = 0; i < RTL8366RB_NUM_PORTS; i++) { + for (i = 0; i < smi->num_ports; i++) { if (!(vlan4k.member & (1 << i))) continue; @@ -811,11 +811,11 @@ static int rtl8366rb_sw_get_vlan_ports(struct switch_dev *dev, if (!smi->ops->is_vlan_valid(smi, val->port_vlan)) return -EINVAL; - rtl8366rb_get_vlan_4k(smi, val->port_vlan, &vlan4k); + smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k); port = &val->value.ports[0]; val->len = 0; - for (i = 0; i < RTL8366RB_NUM_PORTS; i++) { + for (i = 0; i < smi->num_ports; i++) { if (!(vlan4k.member & BIT(i))) continue; diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366s.c b/target/linux/generic/files/drivers/net/phy/rtl8366s.c index 4f4a5f3897..4ac675ea50 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366s.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8366s.c @@ -746,14 +746,14 @@ static int rtl8366s_sw_get_vlan_info(struct switch_dev *dev, memset(buf, '\0', sizeof(smi->buf)); - err = rtl8366s_get_vlan_4k(smi, val->port_vlan, &vlan4k); + err = smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k); if (err) return err; len += snprintf(buf + len, sizeof(smi->buf) - len, "VLAN %d: Ports: '", vlan4k.vid); - for (i = 0; i < RTL8366S_NUM_PORTS; i++) { + for (i = 0; i < smi->num_ports; i++) { if (!(vlan4k.member & (1 << i))) continue; @@ -838,11 +838,11 @@ static int rtl8366s_sw_get_vlan_ports(struct switch_dev *dev, if (!smi->ops->is_vlan_valid(smi, val->port_vlan)) return -EINVAL; - rtl8366s_get_vlan_4k(smi, val->port_vlan, &vlan4k); + smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k); port = &val->value.ports[0]; val->len = 0; - for (i = 0; i < RTL8366S_NUM_PORTS; i++) { + for (i = 0; i < smi->num_ports; i++) { if (!(vlan4k.member & BIT(i))) continue; |