projects
/
openwrt
/
staging
/
lynxis
/
omap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
64d3505
)
unify extended vlan id swconfig attributes. AR8216 and PSB6970 used "pvid", IP17xx...
author
Jo-Philipp Wich
<jow@openwrt.org>
Tue, 12 Oct 2010 20:49:35 +0000
(20:49 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Tue, 12 Oct 2010 20:49:35 +0000
(20:49 +0000)
SVN-Revision: 23419
target/linux/generic/files/drivers/net/phy/ar8216.c
patch
|
blob
|
history
target/linux/generic/files/drivers/net/phy/ip17xx.c
patch
|
blob
|
history
target/linux/generic/files/drivers/net/phy/psb6970.c
patch
|
blob
|
history
target/linux/generic/files/drivers/net/phy/rtl8306.c
patch
|
blob
|
history
diff --git
a/target/linux/generic/files/drivers/net/phy/ar8216.c
b/target/linux/generic/files/drivers/net/phy/ar8216.c
index 98bfc7eb313c573f4c9bea082372040ac1aad88f..93c961c3caf01a488f2ba0a124a618807eda2d24 100644
(file)
--- 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,
static struct switch_attr ar8216_vlan[] = {
{
.type = SWITCH_TYPE_INT,
- .name = "
p
vid",
- .description = "VLAN ID",
+ .name = "vid",
+ .description = "VLAN ID
(0-4094)
",
.set = ar8216_set_vid,
.get = ar8216_get_vid,
.max = 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 646a8426548c16d9d5edf7da8af5382e4974527f..c82c39e052c8a013d21ccc28dbe96ccf61045145 100644
(file)
--- 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,
[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,
}
.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 b9280540ca6b66ee9a79f1527ee57302494ea131..2fcd29901330f3f959509ccb35dc122ac5660241 100644
(file)
--- 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,
static struct switch_attr psb6970_vlan[] = {
{
.type = SWITCH_TYPE_INT,
- .name = "
p
vid",
- .description = "VLAN ID",
+ .name = "vid",
+ .description = "VLAN ID
(0-4094)
",
.set = psb6970_set_vid,
.get = psb6970_get_vid,
.max = 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 87c661a77a3b1b3310cb2039e5743723febfcaef..4fa910a6f27662c42dede9528f7ba052a9320182 100644
(file)
--- 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",
{
RTL_VLAN_REGATTR(VID),
.name = "vid",
- .description = "VLAN ID",
+ .description = "VLAN ID
(1-4095)
",
.max = 4095,
},
};
.max = 4095,
},
};