Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / net / bridge / br_vlan.c

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 5fee2fe..fcc9539 100644 (file)
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -360,6 +360,7 @@ int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val)
                goto unlock;
 
        br->vlan_enabled = val;
+       br_manage_promisc(br);
 
 unlock:
        rtnl_unlock();