diff options
author | Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp> | 2014-08-05 02:57:15 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-05 19:37:10 -0400 |
commit | fdb0a6626e8ef99fda8c30971c59ba51321dbab9 (patch) | |
tree | 4a827d19e6041620e0009c30454a4b1534b6134c /net | |
parent | 618896e6d00773d6d50e0b19f660af22fa26cd61 (diff) |
bridge: Update outdated comment on promiscuous mode
Now bridge ports can be non-promiscuous, vlan_vid_add() is no longer an
unnecessary operation.
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-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) |