ar71xx: ag71xx: keep VLAN tags if VLAN is not enabled

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / drivers / net / ethernet / atheros / ag71xx / ag71xx_ar7240.c

diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
index ab7abd9e5c5f53d1ac2627ca4b95852aaaff7e06..0fc4ba708fd5eae77511ff5777d74648d145a336 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
+++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
@@ -631,11 +631,15 @@ static void ar7240sw_setup_port(struct ar7240sw *as, unsigned port, u8 portmask)
                mode = AR7240_PORT_VLAN_MODE_PORT_ONLY;
        }
 
-       if (as->vlan && (as->vlan_tagged & BIT(port))) {
-               ctrl |= AR7240_PORT_CTRL_VLAN_MODE_ADD <<
-                       AR7240_PORT_CTRL_VLAN_MODE_S;
+       if (as->vlan) {
+               if (as->vlan_tagged & BIT(port))
+                       ctrl |= AR7240_PORT_CTRL_VLAN_MODE_ADD <<
+                               AR7240_PORT_CTRL_VLAN_MODE_S;
+               else
+                       ctrl |= AR7240_PORT_CTRL_VLAN_MODE_STRIP <<
+                               AR7240_PORT_CTRL_VLAN_MODE_S;
        } else {
-               ctrl |= AR7240_PORT_CTRL_VLAN_MODE_STRIP <<
+               ctrl |= AR7240_PORT_CTRL_VLAN_MODE_KEEP <<
                        AR7240_PORT_CTRL_VLAN_MODE_S;
        }