From f7cc8b197ce11b495f5081ae257e90b9aca75858 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 12 Oct 2010 20:49:35 +0000
Subject: [PATCH] [generic] 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.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23419 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/generic/files/drivers/net/phy/ar8216.c  | 4 ++--
 target/linux/generic/files/drivers/net/phy/ip17xx.c  | 4 ++--
 target/linux/generic/files/drivers/net/phy/psb6970.c | 4 ++--
 target/linux/generic/files/drivers/net/phy/rtl8306.c | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c
index 98bfc7eb3..93c961c3c 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 646a84265..c82c39e05 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 b9280540c..2fcd29901 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 87c661a77..4fa910a6f 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,
 	},
 };