Changeset 30928

Timestamp:

2012-03-13T18:33:12+01:00 (6 years ago)

Author:

juhosg

Message:

generic: ar8216: merge multiple if statements in ar8216_hw_apply

File:

• trunk/target/linux/generic/files/drivers/net/phy/ar8216.c (modified) (1 diff)

trunk/target/linux/generic/files/drivers/net/phy/ar8216.c

@@ -622 +622 @@
                 int pvid;
 
-                if (priv->vlan)
+                if (priv->vlan) {
                         pvid = priv->vlan_id[priv->pvid[i]];
-                else
-                        pvid = i;
-
-                if (priv->vlan) {
                         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;
+                        ingress = AR8216_IN_PORT_ONLY;
                 }
-
-                if (priv->vlan)
-                        ingress = AR8216_IN_SECURE;
-                else
-                        ingress = AR8216_IN_PORT_ONLY;
 
                 if (priv->chip == AR8236)