diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-02-28 03:49:38 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-28 03:49:38 -0500 |
commit | 3fe2d7c70b747d5d968f4e8fa210676d49d40059 (patch) | |
tree | f401e1089a3c114db7bcc6b1425433c906d560fb /net/bridge/br_stp.c | |
parent | 5cb5e947d8f82011e3d7e7017e9d10db9a40ae9f (diff) |
bridge: Add multicast start/stop hooks
This patch hooks up the bridge start/stop and add/delete/disable
port functions to the new multicast module.
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_stp.c')
-rw-r--r-- | net/bridge/br_stp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index fd3f8d6c0998..edcf14b560f6 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c | |||
@@ -386,6 +386,8 @@ static void br_make_forwarding(struct net_bridge_port *p) | |||
386 | else | 386 | else |
387 | p->state = BR_STATE_LEARNING; | 387 | p->state = BR_STATE_LEARNING; |
388 | 388 | ||
389 | br_multicast_enable_port(p); | ||
390 | |||
389 | br_log_state(p); | 391 | br_log_state(p); |
390 | 392 | ||
391 | if (br->forward_delay != 0) | 393 | if (br->forward_delay != 0) |