[generic] unify extended vlan id swconfig attributes.
authorJo-Philipp Wich <jow@openwrt.org>
Tue, 12 Oct 2010 20:49:35 +0000 (20:49 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Tue, 12 Oct 2010 20:49:35 +0000 (20:49 +0000)
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

target/linux/generic/files/drivers/net/phy/ar8216.c
target/linux/generic/files/drivers/net/phy/ip17xx.c
target/linux/generic/files/drivers/net/phy/psb6970.c
target/linux/generic/files/drivers/net/phy/rtl8306.c

index 98bfc7e..93c961c 100644 (file)
@@ -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,
index 646a842..c82c39e 100644 (file)
@@ -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,
        }
index b928054..2fcd299 100644 (file)
@@ -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,
index 87c661a..4fa910a 100644 (file)
@@ -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,
        },
 };