bridge: Update outdated comment on promiscuous mode
authorToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Tue, 5 Aug 2014 06:57:15 +0000 (15:57 +0900)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 Aug 2014 23:37:10 +0000 (16:37 -0700)
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>
net/bridge/br_vlan.c

index 2b2774fe0703871e7e4e65ee1d5816375c398e11..febb0f87fa37a1840d8ad470fb2491348da53bd3 100644 (file)
@@ -55,10 +55,8 @@ static int __vlan_add(struct net_port_vlans *v, u16 vid, u16 flags)
 
        if (p) {
                /* Add VLAN to the device filter if it is supported.
-                * Stricly speaking, this is not necessary now, since
-                * devices are made promiscuous by the bridge, but if
-                * that ever changes this code will allow tagged
-                * traffic to enter the bridge.
+                * This ensures tagged traffic enters the bridge when
+                * promiscuous mode is disabled by br_manage_promisc().
                 */
                err = vlan_vid_add(dev, br->vlan_proto, vid);
                if (err)