diff options
| -rw-r--r-- | net/bridge/br_vlan.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index 2b2774fe0703..febb0f87fa37 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c | |||
| @@ -55,10 +55,8 @@ static int __vlan_add(struct net_port_vlans *v, u16 vid, u16 flags) | |||
| 55 | 55 | ||
| 56 | if (p) { | 56 | if (p) { |
| 57 | /* Add VLAN to the device filter if it is supported. | 57 | /* Add VLAN to the device filter if it is supported. |
| 58 | * Stricly speaking, this is not necessary now, since | 58 | * This ensures tagged traffic enters the bridge when |
| 59 | * devices are made promiscuous by the bridge, but if | 59 | * promiscuous mode is disabled by br_manage_promisc(). |
| 60 | * that ever changes this code will allow tagged | ||
| 61 | * traffic to enter the bridge. | ||
| 62 | */ | 60 | */ |
| 63 | err = vlan_vid_add(dev, br->vlan_proto, vid); | 61 | err = vlan_vid_add(dev, br->vlan_proto, vid); |
| 64 | if (err) | 62 | if (err) |