iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bridge: Add multicast start/stop hooks

Browse Source 
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>
This commit is contained in:
Herbert Xu 2010-02-28 00:49:38 -08:00 committed by David S. Miller
parent 5cb5e947d8
commit 3fe2d7c70b
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/bridge/br_device.c
View File

@ -51,6 +51,7 @@ static int br_dev_open(struct net_device *dev)
br_features_recompute(br); br_features_recompute(br);
netif_start_queue(dev); netif_start_queue(dev);
br_stp_enable_bridge(br); br_stp_enable_bridge(br);
br_multicast_open(br);
return 0; 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) 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); netif_stop_queue(dev);

4
net/bridge/br_if.c
View File

@ -147,6 +147,8 @@ static void del_nbp(struct net_bridge_port *p)
rcu_assign_pointer(dev->br_port, NULL); rcu_assign_pointer(dev->br_port, NULL);
br_multicast_del_port(p);
kobject_uevent(&p->kobj, KOBJ_REMOVE); kobject_uevent(&p->kobj, KOBJ_REMOVE);
kobject_del(&p->kobj); kobject_del(&p->kobj);
@ -207,6 +209,7 @@ static struct net_device *new_bridge_dev(struct net *net, const char *name)
br_netfilter_rtable_init(br); br_netfilter_rtable_init(br);
br_stp_timer_init(br); br_stp_timer_init(br);
br_multicast_init(br);
return dev; return dev;
} }
@ -258,6 +261,7 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br,
br_init_port(p); br_init_port(p);
p->state = BR_STATE_DISABLED; p->state = BR_STATE_DISABLED;
br_stp_port_timer_init(p); br_stp_port_timer_init(p);
br_multicast_add_port(p);
return p; return p;
} }

2
net/bridge/br_stp.c
View File

@ -386,6 +386,8 @@ static void br_make_forwarding(struct net_bridge_port *p)
else else
p->state = BR_STATE_LEARNING; p->state = BR_STATE_LEARNING;
br_multicast_enable_port(p);
br_log_state(p); br_log_state(p);
if (br->forward_delay != 0) if (br->forward_delay != 0)

1
net/bridge/br_stp_if.c
View File

@ -108,6 +108,7 @@ void br_stp_disable_port(struct net_bridge_port *p)
del_timer(&p->hold_timer); del_timer(&p->hold_timer);
br_fdb_delete_by_port(br, p, 0); br_fdb_delete_by_port(br, p, 0);
br_multicast_disable_port(p);
br_configuration_update(br); br_configuration_update(br);