From 503953b9f9cefef0ac384b8bebae3c9e981ec828 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 14 Oct 2010 14:03:31 +0000 Subject: [PATCH] [backfire] merge r23419 SVN-Revision: 23441 --- target/linux/generic-2.6/files/drivers/net/phy/ar8216.c | 4 ++-- target/linux/generic-2.6/files/drivers/net/phy/ip17xx.c | 4 ++-- target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) 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 98bfc7eb31..93c961c3ca 100644 --- 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 49b3ece2bd..67a4328c7f 100644 --- 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 87c661a77a..4fa910a6f2 100644 --- 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, }, }; -- 2.30.2