* [PATCH net-next] bridge: Update outdated comment on promiscuous mode
@ 2014-08-05 6:57 Toshiaki Makita
2014-08-05 23:37 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Toshiaki Makita @ 2014-08-05 6:57 UTC (permalink / raw)
To: David S . Miller, Stephen Hemminger; +Cc: Vlad Yasevich, netdev, bridge
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>
---
net/bridge/br_vlan.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 2b2774f..febb0f8 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)
--
1.8.1.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] bridge: Update outdated comment on promiscuous mode
2014-08-05 6:57 [PATCH net-next] bridge: Update outdated comment on promiscuous mode Toshiaki Makita
@ 2014-08-05 23:37 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-08-05 23:37 UTC (permalink / raw)
To: makita.toshiaki; +Cc: stephen, vyasevic, bridge, netdev
From: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Date: Tue, 5 Aug 2014 15:57:15 +0900
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-05 23:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-05 6:57 [PATCH net-next] bridge: Update outdated comment on promiscuous mode Toshiaki Makita
2014-08-05 23:37 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).