generic: rtl8366: add common rtl8366_sw_get_vlan_info

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22203 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 47 insertions, 84 deletions

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
index a45c844ca..e46768f82 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
@@ -788,6 +788,48 @@ int rtl8366_sw_get_port_mib(struct switch_dev *dev,
 }
 EXPORT_SYMBOL_GPL(rtl8366_sw_get_port_mib);
 
+int rtl8366_sw_get_vlan_info(struct switch_dev *dev,
+			     const struct switch_attr *attr,
+			     struct switch_val *val)
+{
+	int i;
+	u32 len = 0;
+	struct rtl8366_vlan_4k vlan4k;
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	char *buf = smi->buf;
+	int err;
+
+	if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
+		return -EINVAL;
+
+	memset(buf, '\0', sizeof(smi->buf));
+
+	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 < smi->num_ports; i++) {
+		if (!(vlan4k.member & (1 << i)))
+			continue;
+
+		len += snprintf(buf + len, sizeof(smi->buf) - len, "%d%s", i,
+				(vlan4k.untag & (1 << i)) ? "" : "t");
+	}
+
+	len += snprintf(buf + len, sizeof(smi->buf) - len,
+			"', members=%04x, untag=%04x, fid=%u",
+			vlan4k.member, vlan4k.untag, vlan4k.fid);
+
+	val->value.s = buf;
+	val->len = len;
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_get_vlan_info);
+
 struct rtl8366_smi *rtl8366_smi_alloc(struct device *parent)
 {
 	struct rtl8366_smi *smi;
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 b53c5010c..ae3b7db6f 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
@@ -114,5 +114,8 @@ int rtl8366_sw_set_port_pvid(struct switch_dev *dev, int port, int val);
 int rtl8366_sw_get_port_mib(struct switch_dev *dev,
 			    const struct switch_attr *attr,
 			    struct switch_val *val);
+int rtl8366_sw_get_vlan_info(struct switch_dev *dev,
+			     const struct switch_attr *attr,
+			     struct switch_val *val);
 
 #endif /*  _RTL8366_SMI_H */
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
index ae976f45b..231e48291 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
@@ -705,47 +705,6 @@ static int rtl8366rb_sw_get_port_link(struct switch_dev *dev,
 	return 0;
 }
 
-static int rtl8366rb_sw_get_vlan_info(struct switch_dev *dev,
-				     const struct switch_attr *attr,
-				     struct switch_val *val)
-{
-	int i;
-	u32 len = 0;
-	struct rtl8366_vlan_4k vlan4k;
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	char *buf = smi->buf;
-	int err;
-
-	if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
-		return -EINVAL;
-
-	memset(buf, '\0', sizeof(smi->buf));
-
-	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 < smi->num_ports; i++) {
-		if (!(vlan4k.member & (1 << i)))
-			continue;
-
-		len += snprintf(buf + len, sizeof(smi->buf) - len, "%d%s", i,
-				(vlan4k.untag & (1 << i)) ? "" : "t");
-	}
-
-	len += snprintf(buf + len, sizeof(smi->buf) - len,
-			"', members=%04x, untag=%04x, fid=%u",
-			vlan4k.member, vlan4k.untag, vlan4k.fid);
-
-	val->value.s = buf;
-	val->len = len;
-
-	return 0;
-}
-
 static int rtl8366rb_sw_set_port_led(struct switch_dev *dev,
 				    const struct switch_attr *attr,
 				    struct switch_val *val)
@@ -937,7 +896,7 @@ static struct switch_attr rtl8366rb_vlan[] = {
 		.description = "Get vlan information",
 		.max = 1,
 		.set = NULL,
-		.get = rtl8366rb_sw_get_vlan_info,
+		.get = rtl8366_sw_get_vlan_info,
 	},
 };
 
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366s.c b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
index 4ac675ea5..167f34f8c 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366s.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
@@ -730,47 +730,6 @@ static int rtl8366s_sw_get_port_link(struct switch_dev *dev,
 	return 0;
 }
 
-static int rtl8366s_sw_get_vlan_info(struct switch_dev *dev,
-				     const struct switch_attr *attr,
-				     struct switch_val *val)
-{
-	int i;
-	u32 len = 0;
-	struct rtl8366_vlan_4k vlan4k;
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	char *buf = smi->buf;
-	int err;
-
-	if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
-		return -EINVAL;
-
-	memset(buf, '\0', sizeof(smi->buf));
-
-	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 < smi->num_ports; i++) {
-		if (!(vlan4k.member & (1 << i)))
-			continue;
-
-		len += snprintf(buf + len, sizeof(smi->buf) - len, "%d%s", i,
-				(vlan4k.untag & (1 << i)) ? "" : "t");
-	}
-
-	len += snprintf(buf + len, sizeof(smi->buf) - len,
-			"', members=%04x, untag=%04x, fid=%u",
-			vlan4k.member, vlan4k.untag, vlan4k.fid);
-
-	val->value.s = buf;
-	val->len = len;
-
-	return 0;
-}
-
 static int rtl8366s_sw_set_port_led(struct switch_dev *dev,
 				    const struct switch_attr *attr,
 				    struct switch_val *val)
@@ -964,7 +923,7 @@ static struct switch_attr rtl8366s_vlan[] = {
 		.description = "Get vlan information",
 		.max = 1,
 		.set = NULL,
-		.get = rtl8366s_sw_get_vlan_info,
+		.get = rtl8366_sw_get_vlan_info,
 	},
 };