Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fe2d7c7 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5cb5e947

net/bridge/br_device.c

+5 −1
Original line number Diff line number Diff line
@@ -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);

net/bridge/br_if.c

+4 −0
Original line number Diff line number Diff line
@@ -147,6 +147,8 @@ static void del_nbp(struct net_bridge_port *p) 


	rcu_assign_pointer(dev->br_port, NULL);



	br_multicast_del_port(p);



	kobject_uevent(&p->kobj, KOBJ_REMOVE);

	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_stp_timer_init(br);

	br_multicast_init(br);



	return dev;

}
@@ -258,6 +261,7 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br, 
	br_init_port(p);

	p->state = BR_STATE_DISABLED;

	br_stp_port_timer_init(p);

	br_multicast_add_port(p);



	return p;

}

net/bridge/br_stp.c

+2 −0
Original line number Diff line number Diff line
@@ -386,6 +386,8 @@ static void br_make_forwarding(struct net_bridge_port *p) 
	else

		p->state = BR_STATE_LEARNING;



	br_multicast_enable_port(p);



	br_log_state(p);



	if (br->forward_delay != 0)

net/bridge/br_stp_if.c

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ void br_stp_disable_port(struct net_bridge_port *p) 
	del_timer(&p->hold_timer);



	br_fdb_delete_by_port(br, p, 0);

	br_multicast_disable_port(p);



	br_configuration_update(br);