[backfire] merge r23419

SVN-Revision: 23441

diff --git a/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c b/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c
index 98bfc7eb313c573f4c9bea082372040ac1aad88f..93c961c3caf01a488f2ba0a124a618807eda2d24 100644 (file)
--- a/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c
+++ b/target/linux/generic-2.6/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-2.6/files/drivers/net/phy/ip17xx.c b/target/linux/generic-2.6/files/drivers/net/phy/ip17xx.c
index 49b3ece2bdf3c545c146ab5c7efd7dcafe96a02d..67a4328c7f0ec5ccc0679b449d5eb0390ce6da47 100644 (file)
--- a/target/linux/generic-2.6/files/drivers/net/phy/ip17xx.c
+++ b/target/linux/generic-2.6/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-2.6/files/drivers/net/phy/rtl8306.c b/target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c
index 87c661a77a3b1b3310cb2039e5743723febfcaef..4fa910a6f27662c42dede9528f7ba052a9320182 100644 (file)
--- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c
+++ b/target/linux/generic-2.6/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,
        },
 };