From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 12 Oct 2010 20:49:35 +0000 (+0000)
Subject: unify extended vlan id swconfig attributes. AR8216 and PSB6970 used "pvid", IP17xx... 
X-Git-Tag: reboot~18699
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=352fea83d9181d41a93472428afdb892381b74f2;p=openwrt%2Fstaging%2Fblogic.git

unify extended vlan id swconfig attributes. AR8216 and PSB6970 used "pvid", IP17xx used "tag" and RTL8306 called it "vid". Change all to "vid" and annotate the description with the valid ID range.

SVN-Revision: 23419
---

diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c
index 98bfc7eb313c..93c961c3caf0 100644
--- a/target/linux/generic/files/drivers/net/phy/ar8216.c
+++ b/target/linux/generic/files/drivers/net/phy/ar8216.c
@@ -329,8 +329,8 @@ static struct switch_attr ar8216_port[] = {
 static struct switch_attr ar8216_vlan[] = {
 	{
 		.type = SWITCH_TYPE_INT,
-		.name = "pvid",
-		.description = "VLAN ID",
+		.name = "vid",
+		.description = "VLAN ID (0-4094)",
 		.set = ar8216_set_vid,
 		.get = ar8216_get_vid,
 		.max = 4094,
diff --git a/target/linux/generic/files/drivers/net/phy/ip17xx.c b/target/linux/generic/files/drivers/net/phy/ip17xx.c
index 646a8426548c..c82c39e052c8 100644
--- a/target/linux/generic/files/drivers/net/phy/ip17xx.c
+++ b/target/linux/generic/files/drivers/net/phy/ip17xx.c
@@ -1210,8 +1210,8 @@ static const struct switch_attr ip17xx_vlan[] = {
 	[IP17XX_VLAN_TAG] = {
 		.id = IP17XX_VLAN_TAG,
 		.type = SWITCH_TYPE_INT,
-		.description = "VLAN tag (0-4095) [IP175D only]",
-		.name = "tag",
+		.description = "VLAN ID (0-4095) [IP175D only]",
+		.name = "vid",
 		.get = ip17xx_get_tag,
 		.set = ip17xx_set_tag,
 	}
diff --git a/target/linux/generic/files/drivers/net/phy/psb6970.c b/target/linux/generic/files/drivers/net/phy/psb6970.c
index b9280540ca6b..2fcd29901330 100644
--- a/target/linux/generic/files/drivers/net/phy/psb6970.c
+++ b/target/linux/generic/files/drivers/net/phy/psb6970.c
@@ -149,8 +149,8 @@ static struct switch_attr psb6970_port[] = {
 static struct switch_attr psb6970_vlan[] = {
 	{
 	 .type = SWITCH_TYPE_INT,
-	 .name = "pvid",
-	 .description = "VLAN ID",
+	 .name = "vid",
+	 .description = "VLAN ID (0-4094)",
 	 .set = psb6970_set_vid,
 	 .get = psb6970_get_vid,
 	 .max = 4094,
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8306.c b/target/linux/generic/files/drivers/net/phy/rtl8306.c
index 87c661a77a3b..4fa910a6f276 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8306.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8306.c
@@ -829,7 +829,7 @@ static struct switch_attr rtl_vlan[] = {
 	{
 		RTL_VLAN_REGATTR(VID),
 		.name = "vid",
-		.description = "VLAN ID",
+		.description = "VLAN ID (1-4095)",
 		.max = 4095,
 	},
 };