diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-01-20 07:06:18 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-01-20 07:06:18 +0000 |
| commit | e41e188da3b29832e82661e4ddfd85750890b0f3 (patch) | |
| tree | dee2854a3b02486d9a163a8f11a0ffc27b50c72e /target/linux/ar71xx | |
| parent | c1681883a5fa112c24439e387fd27ae05b0b5052 (diff) | |
| download | upstream-e41e188da3b29832e82661e4ddfd85750890b0f3.tar.gz upstream-e41e188da3b29832e82661e4ddfd85750890b0f3.tar.bz2 upstream-e41e188da3b29832e82661e4ddfd85750890b0f3.zip | |
rtl8366_smi: fix return codes in rtl8366s_reset_vlan
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19240 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx')
| -rw-r--r-- | target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c b/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c index 6e890b451c..6c807bc020 100644 --- a/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c +++ b/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c @@ -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) { - int i; struct rtl8366s_vlan4kentry vlan4k; struct rtl8366s_vlanconfig vlanmc; + int err; + int i; /* clear 16 VLAN member configuration */ vlanmc.vid = 0; @@ -947,8 +948,9 @@ static int rtl8366s_reset_vlan(struct rtl8366_smi *smi) vlanmc.untag = 0; vlanmc.fid = 0; for (i = 0; i < RTL8366_NUM_VLANS; i++) { - if (rtl8366s_set_vlan_member_config(smi, i, &vlanmc) != 0) - return -EIO; + err = rtl8366s_set_vlan_member_config(smi, i, &vlanmc); + if (err) + return err; } /* 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.untag = RTL8366_PORT_ALL; vlan4k.fid = 0; - if (rtl8366s_set_vlan_4k_entry(smi, &vlan4k) != 0) - return -EIO; + err = rtl8366s_set_vlan_4k_entry(smi, &vlan4k); + if (err) + return err; /* Set all ports PVID to default VLAN */ for (i = 0; i < RTL8366_NUM_PORTS; i++) { - if (rtl8366_set_vlan_port_pvid(smi, i, 0) != 0) - return -EIO; + err = rtl8366_set_vlan_port_pvid(smi, i, 0); + if (err) + return err; } return 0; |