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

rtl8366_smi: fix return codes in rtl8366s_reset_vlan 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19240 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Gabor Juhos 2010-01-20 07:06:18 +00:00
parent c1681883a5
commit e41e188da3
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c
View File

@ -936,9 +936,10 @@ static int rtl8366_vlan_set_4ktable(struct rtl8366_smi *smi, int enable)
static int rtl8366s_reset_vlan(struct rtl8366_smi *smi) static int rtl8366s_reset_vlan(struct rtl8366_smi *smi)
{ {
int i;
struct rtl8366s_vlan4kentry vlan4k; struct rtl8366s_vlan4kentry vlan4k;
struct rtl8366s_vlanconfig vlanmc; struct rtl8366s_vlanconfig vlanmc;
int err;
int i;
/* clear 16 VLAN member configuration */ /* clear 16 VLAN member configuration */
vlanmc.vid = 0; vlanmc.vid = 0;
@ -947,8 +948,9 @@ static int rtl8366s_reset_vlan(struct rtl8366_smi *smi)
vlanmc.untag = 0; vlanmc.untag = 0;
vlanmc.fid = 0; vlanmc.fid = 0;
for (i = 0; i < RTL8366_NUM_VLANS; i++) { for (i = 0; i < RTL8366_NUM_VLANS; i++) {
if (rtl8366s_set_vlan_member_config(smi, i, &vlanmc) != 0) err = rtl8366s_set_vlan_member_config(smi, i, &vlanmc);
return -EIO; if (err)
return err;
} }
/* Set a default VLAN with vid 1 to 4K table for all ports */ /* Set a default VLAN with vid 1 to 4K table for all ports */
@ -956,13 +958,15 @@ static int rtl8366s_reset_vlan(struct rtl8366_smi *smi)
vlan4k.member = RTL8366_PORT_ALL; vlan4k.member = RTL8366_PORT_ALL;
vlan4k.untag = RTL8366_PORT_ALL; vlan4k.untag = RTL8366_PORT_ALL;
vlan4k.fid = 0; vlan4k.fid = 0;
if (rtl8366s_set_vlan_4k_entry(smi, &vlan4k) != 0) err = rtl8366s_set_vlan_4k_entry(smi, &vlan4k);
return -EIO; if (err)
return err;
/* Set all ports PVID to default VLAN */ /* Set all ports PVID to default VLAN */
for (i = 0; i < RTL8366_NUM_PORTS; i++) { for (i = 0; i < RTL8366_NUM_PORTS; i++) {
if (rtl8366_set_vlan_port_pvid(smi, i, 0) != 0) err = rtl8366_set_vlan_port_pvid(smi, i, 0);
return -EIO; if (err)
return err;
} }
return 0; return 0;