summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2017-11-07 00:04:24 +0100
committerDavid S. Miller <davem@davemloft.net>2017-11-10 14:28:13 +0900
commit2ea7a679ca2abd251c1ec03f20508619707e1749 (patch)
treed7f2e26bd8ac44cec8443de0beec7d6932da8e64 /net
parent4fdc3023c67c1c951d0b5594f37a2066d5191bdc (diff)
downloadlinux-2ea7a679ca2abd251c1ec03f20508619707e1749.tar.bz2
net: dsa: Don't add vlans when vlan filtering is disabled
The software bridge can be build with vlan filtering support included. However, by default it is turned off. In its turned off state, it still passes VLANs via switchev, even though they are not to be used. Don't pass these VLANs to the hardware. Only do so when vlan filtering is enabled. This fixes at least one corner case. There are still issues in other corners, such as when vlan_filtering is later enabled. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/dsa/port.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/net/dsa/port.c b/net/dsa/port.c
index a85cd63a91c4..bb4be2679904 100644
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -252,7 +252,10 @@ int dsa_port_vlan_add(struct dsa_port *dp,
.vlan = vlan,
};
- return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_ADD, &info);
+ if (br_vlan_enabled(dp->bridge_dev))
+ return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_ADD, &info);
+
+ return 0;
}
int dsa_port_vlan_del(struct dsa_port *dp,
@@ -264,7 +267,10 @@ int dsa_port_vlan_del(struct dsa_port *dp,
.vlan = vlan,
};
- return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &info);
+ if (br_vlan_enabled(dp->bridge_dev))
+ return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &info);
+
+ return 0;
}
int dsa_port_fixed_link_register_of(struct dsa_port *dp)