From: Gabor Juhos <juhosg@openwrt.org>
Date: Thu, 15 Jul 2010 13:05:39 +0000 (+0000)
Subject: generic: rtl8366: add is_vlan_valid function to smi_ops
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ce7eca2dff722edfda9c91d50b51878de7c096c6;p=openwrt%2Fstaging%2Fthess.git

generic: rtl8366: add is_vlan_valid function to smi_ops

SVN-Revision: 22201
---

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 2e8f9298dc..b53c5010ce 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
@@ -86,6 +86,7 @@ struct rtl8366_smi_ops {
 	int	(*set_mc_index)(struct rtl8366_smi *smi, int port, int index);
 	int	(*get_mib_counter)(struct rtl8366_smi *smi, int counter,
 				   int port, unsigned long long *val);
+	int	(*is_vlan_valid)(struct rtl8366_smi *smi, unsigned vlan);
 };
 
 struct rtl8366_smi *rtl8366_smi_alloc(struct device *parent);
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
index b6d3f9805f..2efde1df3f 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)
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366s.c b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
index 9936b45380..4f4a5f3897 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366s.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
@@ -591,6 +591,14 @@ static int rtl8366s_vlan_set_4ktable(struct rtl8366_smi *smi, int enable)
 				1, (enable) ? 1 : 0);
 }
 
+static int rtl8366s_is_vlan_valid(struct rtl8366_smi *smi, unsigned vlan)
+{
+	if (vlan == 0 || vlan >= RTL8366S_NUM_VLANS)
+		return 0;
+
+	return 1;
+}
+
 static int rtl8366s_sw_reset_mibs(struct switch_dev *dev,
 				  const struct switch_attr *attr,
 				  struct switch_val *val)
@@ -733,7 +741,7 @@ static int rtl8366s_sw_get_vlan_info(struct switch_dev *dev,
 	char *buf = smi->buf;
 	int err;
 
-	if (val->port_vlan == 0 || val->port_vlan >= RTL8366S_NUM_VLANS)
+	if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
 		return -EINVAL;
 
 	memset(buf, '\0', sizeof(smi->buf));
@@ -827,7 +835,7 @@ static int rtl8366s_sw_get_vlan_ports(struct switch_dev *dev,
 	struct rtl8366_vlan_4k vlan4k;
 	int i;
 
-	if (val->port_vlan == 0 || val->port_vlan >= RTL8366S_NUM_VLANS)
+	if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
 		return -EINVAL;
 
 	rtl8366s_get_vlan_4k(smi, val->port_vlan, &vlan4k);
@@ -856,7 +864,7 @@ static int rtl8366s_sw_set_vlan_ports(struct switch_dev *dev,
 	u32 untag = 0;
 	int i;
 
-	if (val->port_vlan == 0 || val->port_vlan >= RTL8366S_NUM_VLANS)
+	if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
 		return -EINVAL;
 
 	port = &val->value.ports[0];
@@ -1098,6 +1106,7 @@ static struct rtl8366_smi_ops rtl8366s_smi_ops = {
 	.get_mc_index	= rtl8366s_get_mc_index,
 	.set_mc_index	= rtl8366s_set_mc_index,
 	.get_mib_counter = rtl8366_get_mib_counter,
+	.is_vlan_valid	= rtl8366s_is_vlan_valid,
 };
 
 static int __init rtl8366s_probe(struct platform_device *pdev)