qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-28 00:04:05 +02:00
Code

generic: ar8216: merge multiple if statements in ar8216_hw_apply

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30928 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2012-03-13 17:33:12 +00:00
parent 1faec31054
commit ab881f8a9d
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target/linux/generic/files/drivers/net/phy/ar8216.c
View File

@ -621,24 +621,18 @@ ar8216_hw_apply(struct switch_dev *dev)
int egress, ingress; int egress, ingress;
int pvid; int pvid;
if (priv->vlan)
pvid = priv->vlan_id[priv->pvid[i]];
else
pvid = i;
if (priv->vlan) { if (priv->vlan) {
pvid = priv->vlan_id[priv->pvid[i]];
if (priv->vlan_tagged & (1 << i)) if (priv->vlan_tagged & (1 << i))
egress = AR8216_OUT_ADD_VLAN; egress = AR8216_OUT_ADD_VLAN;
else else
egress = AR8216_OUT_STRIP_VLAN; egress = AR8216_OUT_STRIP_VLAN;
} else {
egress = AR8216_OUT_KEEP;
}
if (priv->vlan)
ingress = AR8216_IN_SECURE; ingress = AR8216_IN_SECURE;
else } else {
pvid = i;
egress = AR8216_OUT_KEEP;
ingress = AR8216_IN_PORT_ONLY; ingress = AR8216_IN_PORT_ONLY;
}
if (priv->chip == AR8236) if (priv->chip == AR8236)
ar8236_setup_port(priv, i, egress, ingress, portmask[i], ar8236_setup_port(priv, i, egress, ingress, portmask[i],