diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-07-15 13:05:39 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-07-15 13:05:39 +0000 |
| commit | ce7eca2dff722edfda9c91d50b51878de7c096c6 (patch) | |
| tree | 43f455e083a11ae8dc9921d1f0a102773ccdd350 /target/linux/generic/files/drivers/net/phy/rtl8366rb.c | |
| parent | dffd45dc610c71caecaf79fc512e203aadda2b8b (diff) | |
| download | mtk-20170518-ce7eca2dff722edfda9c91d50b51878de7c096c6.zip mtk-20170518-ce7eca2dff722edfda9c91d50b51878de7c096c6.tar.gz mtk-20170518-ce7eca2dff722edfda9c91d50b51878de7c096c6.tar.bz2 | |
generic: rtl8366: add is_vlan_valid function to smi_ops
SVN-Revision: 22201
Diffstat (limited to 'target/linux/generic/files/drivers/net/phy/rtl8366rb.c')
| -rw-r--r-- | target/linux/generic/files/drivers/net/phy/rtl8366rb.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c index b6d3f98..2efde1d 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c @@ -552,6 +552,14 @@ static int rtl8366rb_set_mc_index(struct rtl8366_smi *smi, int port, int index) RTL8366RB_PORT_VLAN_CTRL_SHIFT(port)); } +static int rtl8366rb_is_vlan_valid(struct rtl8366_smi *smi, unsigned vlan) +{ + if (vlan == 0 || vlan >= RTL8366RB_NUM_VLANS) + return 0; + + return 1; +} + static int rtl8366rb_vlan_set_vlan(struct rtl8366_smi *smi, int enable) { return rtl8366_smi_rmwr(smi, RTL8366RB_SGCR, RTL8366RB_SGCR_EN_VLAN, @@ -708,7 +716,7 @@ static int rtl8366rb_sw_get_vlan_info(struct switch_dev *dev, char *buf = smi->buf; int err; - if (val->port_vlan == 0 || val->port_vlan >= RTL8366RB_NUM_VLANS) + if (!smi->ops->is_vlan_valid(smi, val->port_vlan)) return -EINVAL; memset(buf, '\0', sizeof(smi->buf)); @@ -800,7 +808,7 @@ static int rtl8366rb_sw_get_vlan_ports(struct switch_dev *dev, struct rtl8366_vlan_4k vlan4k; int i; - if (val->port_vlan == 0 || val->port_vlan >= RTL8366RB_NUM_VLANS) + if (!smi->ops->is_vlan_valid(smi, val->port_vlan)) return -EINVAL; rtl8366rb_get_vlan_4k(smi, val->port_vlan, &vlan4k); @@ -829,7 +837,7 @@ static int rtl8366rb_sw_set_vlan_ports(struct switch_dev *dev, u32 untag = 0; int i; - if (val->port_vlan == 0 || val->port_vlan >= RTL8366RB_NUM_VLANS) + if (!smi->ops->is_vlan_valid(smi, val->port_vlan)) return -EINVAL; port = &val->value.ports[0]; @@ -1071,6 +1079,7 @@ static struct rtl8366_smi_ops rtl8366rb_smi_ops = { .get_mc_index = rtl8366rb_get_mc_index, .set_mc_index = rtl8366rb_set_mc_index, .get_mib_counter = rtl8366rb_get_mib_counter, + .is_vlan_valid = rtl8366rb_is_vlan_valid, }; static int __init rtl8366rb_probe(struct platform_device *pdev) |