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_device.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_device.c')
-rw-r--r-- | net/bridge/br_device.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index be356293caa1..91dffe7574d6 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) | |||
51 | br_features_recompute(br); | 51 | br_features_recompute(br); |
52 | netif_start_queue(dev); | 52 | netif_start_queue(dev); |
53 | br_stp_enable_bridge(br); | 53 | br_stp_enable_bridge(br); |
54 | br_multicast_open(br); | ||
54 | 55 | ||
55 | return 0; | 56 | return 0; |
56 | } | 57 | } |
@@ -61,7 +62,10 @@ static void br_dev_set_multicast_list(struct net_device *dev) | |||
61 | 62 | ||
62 | static int br_dev_stop(struct net_device *dev) | 63 | static int br_dev_stop(struct net_device *dev) |
63 | { | 64 | { |
64 | br_stp_disable_bridge(netdev_priv(dev)); | 65 | struct net_bridge *br = netdev_priv(dev); |
66 | |||
67 | br_stp_disable_bridge(br); | ||
68 | br_multicast_stop(br); | ||
65 | 69 | ||
66 | netif_stop_queue(dev); | 70 | netif_stop_queue(dev); |
67 | 71 | ||