diff options
| author | Toshiaki Makita | 2014-08-05 08:57:15 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-08-06 01:37:10 +0200 |
| commit | fdb0a6626e8ef99fda8c30971c59ba51321dbab9 (patch) | |
| tree | 4a827d19e6041620e0009c30454a4b1534b6134c /net | |
| parent | Merge branch 'net-timestamp-next' (diff) | |
| download | kernel-qcow2-linux-fdb0a6626e8ef99fda8c30971c59ba51321dbab9.tar.gz kernel-qcow2-linux-fdb0a6626e8ef99fda8c30971c59ba51321dbab9.tar.xz kernel-qcow2-linux-fdb0a6626e8ef99fda8c30971c59ba51321dbab9.zip | |
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) 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) |