hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

switch: reverse if else in handle_vlan_port_read() 

SVN-Revision: 35581
owl
Hauke Mehrtens 2013-02-13 16:03:27 +00:00
parent 9d3b0f5661
commit 3c51948454
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
package/switch/src/switch-robo.c
View File

@ -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) { if (robo.is_5365) {
u32 val32; robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5365, val16);
robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS, val16);
/* actual read */ /* actual read */
val32 = robo_read32(ROBO_VLAN_PAGE, ROBO_VLAN_READ); val16 = robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_READ);
if ((val32 & (1 << 20)) /* valid */) { if ((val16 & (1 << 14)) /* valid */) {
for (j = 0; j < 6; j++) { for (j = 0; j < 6; j++) {
if (val32 & (1 << j)) { if (val16 & (1 << j)) {
len += sprintf(buf + len, "%d", j); len += sprintf(buf + len, "%d", j);
if (val32 & (1 << (j + 6))) { if (val16 & (1 << (j + 7))) {
if (j == 5) buf[len++] = 'u'; if (j == 5)
buf[len++] = 'u';
} else { } else {
buf[len++] = 't'; buf[len++] = 't';
if (robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_PORT0_DEF_TAG + (j << 1)) == nr) 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"); len += sprintf(buf + len, "\n");
} }
} else { } 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 */
val16 = robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_READ); val32 = robo_read32(ROBO_VLAN_PAGE, ROBO_VLAN_READ);
if ((val16 & (1 << 14)) /* valid */) { if ((val32 & (1 << 20)) /* valid */) {
for (j = 0; j < 6; j++) { for (j = 0; j < 6; j++) {
if (val16 & (1 << j)) { if (val32 & (1 << j)) {
len += sprintf(buf + len, "%d", j); len += sprintf(buf + len, "%d", j);
if (val16 & (1 << (j + 7))) { if (val32 & (1 << (j + 6))) {
if (j == 5) buf[len++] = 'u'; if (j == 5)
buf[len++] = 'u';
} else { } else {
buf[len++] = 't'; buf[len++] = 't';
if (robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_PORT0_DEF_TAG + (j << 1)) == nr) if (robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_PORT0_DEF_TAG + (j << 1)) == nr)