ar8216: do not strip vlan tags when running with vlan_enable=0

SVN-Revision: 29718
13 years ago · c33e016fa5
parent fbf81c8e79
commit c33e016fa5
1 changed files with 6 additions and 3 deletions
--- a/target/linux/generic/files/drivers/net/phy/ar8216.c
+++ b/target/linux/generic/files/drivers/net/phy/ar8216.c
@ -593,10 +593,13 @@ ar8216_hw_apply(struct switch_dev *dev)
 			pvid = i;
 		}

-		if (priv->vlan && (priv->vlan_tagged & (1 << i))) {
-			egress = AR8216_OUT_ADD_VLAN;
+		if (priv->vlan) {
+			if (priv->vlan_tagged & (1 << i))
+				egress = AR8216_OUT_ADD_VLAN;
+			else
+				egress = AR8216_OUT_STRIP_VLAN;
 		} else {
-			egress = AR8216_OUT_STRIP_VLAN;
+			egress = AR8216_OUT_KEEP;
 		}
 		if (priv->vlan) {
 			ingress = AR8216_IN_SECURE;