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:
9d3b0f5
)
switch: reverse if else in handle_vlan_port_read()
author
Hauke Mehrtens
<hauke@hauke-m.de>
Wed, 13 Feb 2013 16:03:27 +0000
(16:03 +0000)
committer
Hauke Mehrtens
<hauke@hauke-m.de>
Wed, 13 Feb 2013 16:03:27 +0000
(16:03 +0000)
SVN-Revision: 35581
package/switch/src/switch-robo.c
patch
|
blob
|
history
diff --git
a/package/switch/src/switch-robo.c
b/package/switch/src/switch-robo.c
index 9c78d8281f9e903f97b7e0b8089e42786b83602c..0ab2f693416c396fd7ac6bd305541a67475dfa05 100644
(file)
--- a/
package/switch/src/switch-robo.c
+++ b/
package/switch/src/switch-robo.c
@@
-419,17
+419,17
@@
static int handle_vlan_port_read(void *driver, char *buf, int nr)
val16 = (nr) /* vlan */ | (0 << 12) /* read */ | (1 << 13) /* enable */;
val16 = (nr) /* vlan */ | (0 << 12) /* read */ | (1 << 13) /* enable */;
- if (!robo.is_5365) {
- u32 val32;
- robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS, val16);
+ if (robo.is_5365) {
+ robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5365, val16);
/* actual read */
/* actual read */
- val
32 = robo_read32
(ROBO_VLAN_PAGE, ROBO_VLAN_READ);
- if ((val
32 & (1 << 20
)) /* valid */) {
+ val
16 = robo_read16
(ROBO_VLAN_PAGE, ROBO_VLAN_READ);
+ if ((val
16 & (1 << 14
)) /* valid */) {
for (j = 0; j < 6; j++) {
for (j = 0; j < 6; j++) {
- if (val
32
& (1 << j)) {
+ if (val
16
& (1 << j)) {
len += sprintf(buf + len, "%d", j);
len += sprintf(buf + len, "%d", j);
- if (val32 & (1 << (j + 6))) {
- if (j == 5) buf[len++] = 'u';
+ if (val16 & (1 << (j + 7))) {
+ if (j == 5)
+ buf[len++] = 'u';
} else {
buf[len++] = 't';
if (robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_PORT0_DEF_TAG + (j << 1)) == nr)
} else {
buf[len++] = 't';
if (robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_PORT0_DEF_TAG + (j << 1)) == nr)
@@
-441,15
+441,17
@@
static int handle_vlan_port_read(void *driver, char *buf, int nr)
len += sprintf(buf + len, "\n");
}
} else {
len += sprintf(buf + len, "\n");
}
} else {
- robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5365, val16);
+ u32 val32;
+ robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS, val16);
/* actual read */
/* actual read */
- val
16 = robo_read16
(ROBO_VLAN_PAGE, ROBO_VLAN_READ);
- if ((val
16 & (1 << 14
)) /* valid */) {
+ val
32 = robo_read32
(ROBO_VLAN_PAGE, ROBO_VLAN_READ);
+ if ((val
32 & (1 << 20
)) /* valid */) {
for (j = 0; j < 6; j++) {
for (j = 0; j < 6; j++) {
- if (val
16
& (1 << j)) {
+ if (val
32
& (1 << j)) {
len += sprintf(buf + len, "%d", j);
len += sprintf(buf + len, "%d", j);
- if (val16 & (1 << (j + 7))) {
- if (j == 5) buf[len++] = 'u';
+ if (val32 & (1 << (j + 6))) {
+ if (j == 5)
+ buf[len++] = 'u';
} else {
buf[len++] = 't';
if (robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_PORT0_DEF_TAG + (j << 1)) == nr)
} else {
buf[len++] = 't';
if (robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_PORT0_DEF_TAG + (j << 1)) == nr)