diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-03-13 17:33:12 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-03-13 17:33:12 +0000 |
| commit | 72f225874bd37d298cdfc9e7d1e610654307ae6c (patch) | |
| tree | 47fdeb89a4b21b6dac25e153afd7dd1966770ef6 | |
| parent | 432108e415a9ec576a487063c9407bbefda0bed0 (diff) | |
| download | upstream-72f225874bd37d298cdfc9e7d1e610654307ae6c.tar.gz upstream-72f225874bd37d298cdfc9e7d1e610654307ae6c.tar.bz2 upstream-72f225874bd37d298cdfc9e7d1e610654307ae6c.zip | |
generic: ar8216: merge multiple if statements in ar8216_hw_apply
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30928 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic/files/drivers/net/phy/ar8216.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c index ffa561b36c..4b67cb6cbb 100644 --- a/target/linux/generic/files/drivers/net/phy/ar8216.c +++ b/target/linux/generic/files/drivers/net/phy/ar8216.c @@ -621,24 +621,18 @@ ar8216_hw_apply(struct switch_dev *dev) int egress, ingress; int pvid; - if (priv->vlan) - pvid = priv->vlan_id[priv->pvid[i]]; - else - pvid = i; - if (priv->vlan) { + pvid = priv->vlan_id[priv->pvid[i]]; if (priv->vlan_tagged & (1 << i)) egress = AR8216_OUT_ADD_VLAN; else egress = AR8216_OUT_STRIP_VLAN; + ingress = AR8216_IN_SECURE; } else { + pvid = i; egress = AR8216_OUT_KEEP; - } - - if (priv->vlan) - ingress = AR8216_IN_SECURE; - else ingress = AR8216_IN_PORT_ONLY; + } if (priv->chip == AR8236) ar8236_setup_port(priv, i, egress, ingress, portmask[i], |