summaryrefslogtreecommitdiffstats
path: root/net/bridge/br_device.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2010-02-28 00:49:38 -0800
committerDavid S. Miller <davem@davemloft.net>2010-02-28 00:49:38 -0800
commit3fe2d7c70b747d5d968f4e8fa210676d49d40059 (patch)
treef401e1089a3c114db7bcc6b1425433c906d560fb /net/bridge/br_device.c
parent5cb5e947d8f82011e3d7e7017e9d10db9a40ae9f (diff)
downloadop-kernel-dev-3fe2d7c70b747d5d968f4e8fa210676d49d40059.zip
op-kernel-dev-3fe2d7c70b747d5d968f4e8fa210676d49d40059.tar.gz
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_device.c')
-rw-r--r--net/bridge/br_device.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index be35629..91dffe7 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -51,6 +51,7 @@ static int br_dev_open(struct net_device *dev)
br_features_recompute(br);
netif_start_queue(dev);
br_stp_enable_bridge(br);
+ br_multicast_open(br);
return 0;
}
@@ -61,7 +62,10 @@ static void br_dev_set_multicast_list(struct net_device *dev)
static int br_dev_stop(struct net_device *dev)
{
- br_stp_disable_bridge(netdev_priv(dev));
+ struct net_bridge *br = netdev_priv(dev);
+
+ br_stp_disable_bridge(br);
+ br_multicast_stop(br);
netif_stop_queue(dev);
OpenPOWER on IntegriCloud