aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge/br_input.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2010-02-27 14:41:48 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-28 03:49:45 -0500
commitc4fcb78cf8ae55667809e54e54872a21025dd073 (patch)
tree3c0319c853f6275494d60f32fc8ade12532f13a6 /net/bridge/br_input.c
parent3fe2d7c70b747d5d968f4e8fa210676d49d40059 (diff)
bridge: Add multicast data-path hooks
This patch finally hooks up the multicast snooping module to the data path. In particular, all multicast packets passing through the bridge are fed into the module and switched by it. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_input.c')
-rw-r--r--net/bridge/br_input.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index edfdaef44296..53b39851d87d 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -41,6 +41,7 @@ int br_handle_frame_finish(struct sk_buff *skb)
41 struct net_bridge_port *p = rcu_dereference(skb->dev->br_port); 41 struct net_bridge_port *p = rcu_dereference(skb->dev->br_port);
42 struct net_bridge *br; 42 struct net_bridge *br;
43 struct net_bridge_fdb_entry *dst; 43 struct net_bridge_fdb_entry *dst;
44 struct net_bridge_mdb_entry *mdst;
44 struct sk_buff *skb2; 45 struct sk_buff *skb2;
45 46
46 if (!p || p->state == BR_STATE_DISABLED) 47 if (!p || p->state == BR_STATE_DISABLED)
@@ -50,6 +51,10 @@ int br_handle_frame_finish(struct sk_buff *skb)
50 br = p->br; 51 br = p->br;
51 br_fdb_update(br, p, eth_hdr(skb)->h_source); 52 br_fdb_update(br, p, eth_hdr(skb)->h_source);
52 53
54 if (is_multicast_ether_addr(dest) &&
55 br_multicast_rcv(br, p, skb))
56 goto drop;
57
53 if (p->state == BR_STATE_LEARNING) 58 if (p->state == BR_STATE_LEARNING)
54 goto drop; 59 goto drop;
55 60
@@ -64,8 +69,19 @@ int br_handle_frame_finish(struct sk_buff *skb)
64 dst = NULL; 69 dst = NULL;
65 70
66 if (is_multicast_ether_addr(dest)) { 71 if (is_multicast_ether_addr(dest)) {
72 mdst = br_mdb_get(br, skb);
73 if (mdst || BR_INPUT_SKB_CB(skb)->mrouters_only) {
74 if ((mdst && !hlist_unhashed(&mdst->mglist)) ||
75 br_multicast_is_router(br))
76 skb2 = skb;
77 br_multicast_forward(mdst, skb, skb2);
78 skb = NULL;
79 if (!skb2)
80 goto out;
81 } else
82 skb2 = skb;
83
67 br->dev->stats.multicast++; 84 br->dev->stats.multicast++;
68 skb2 = skb;
69 } else if ((dst = __br_fdb_get(br, dest)) && dst->is_local) { 85 } else if ((dst = __br_fdb_get(br, dest)) && dst->is_local) {
70 skb2 = skb; 86 skb2 = skb;
71 /* Do not forward the packet since it's local. */ 87 /* Do not forward the packet since it's local. */