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

Commit 8384b5f5 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: bridge: add helper to set topology change 



Add a __br_set_topology_change helper to set the topology change value.

This can be later extended to add actions when the topology change flag
is set or cleared.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 82dd4332

net/bridge/br_private_stp.h

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ void br_received_tcn_bpdu(struct net_bridge_port *p); 
void br_transmit_config(struct net_bridge_port *p);

void br_transmit_tcn(struct net_bridge *br);

void br_topology_change_detection(struct net_bridge *br);

void __br_set_topology_change(struct net_bridge *br, unsigned char val);



/* br_stp_bpdu.c */

void br_send_config_bpdu(struct net_bridge_port *, struct br_config_bpdu *);

net/bridge/br_stp.c

+8 −2
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static void br_record_config_timeout_values(struct net_bridge *br, 
	br->max_age = bpdu->max_age;

	br->hello_time = bpdu->hello_time;

	br->forward_delay = bpdu->forward_delay;

	br->topology_change = bpdu->topology_change;

	__br_set_topology_change(br, bpdu->topology_change);

}



/* called under bridge lock */
@@ -344,7 +344,7 @@ void br_topology_change_detection(struct net_bridge *br) 
		isroot ? "propagating" : "sending tcn bpdu");



	if (isroot) {

		br->topology_change = 1;

		__br_set_topology_change(br, 1);

		mod_timer(&br->topology_change_timer, jiffies

			  + br->bridge_forward_delay + br->bridge_max_age);

	} else if (!br->topology_change_detected) {
@@ -603,6 +603,12 @@ int br_set_ageing_time(struct net_bridge *br, clock_t ageing_time) 
	return 0;

}



/* called under bridge lock */

void __br_set_topology_change(struct net_bridge *br, unsigned char val)

{

	br->topology_change = val;

}



void __br_set_forward_delay(struct net_bridge *br, unsigned long t)

{

	br->bridge_forward_delay = t;

net/bridge/br_stp_if.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ void br_stp_disable_bridge(struct net_bridge *br) 


	}



	br->topology_change = 0;

	__br_set_topology_change(br, 0);

	br->topology_change_detected = 0;

	spin_unlock_bh(&br->lock);

net/bridge/br_stp_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void br_topology_change_timer_expired(unsigned long arg) 
	br_debug(br, "topo change timer expired\n");

	spin_lock(&br->lock);

	br->topology_change_detected = 0;

	br->topology_change = 0;

	__br_set_topology_change(br, 0);

	spin_unlock(&br->lock);

}