Skip to contentSkip to conversation

[2.6.7] Bridge - Fix BPDU message_age

PATCH New Kishore A K 1 participant 1 message Jun 22, 2004

Subsystems (2)
Networking Ethernet bridge
lore
Share & tools
lore

Kishore A K

author
#0 lore raw

PATCH 1/1 [2.6.7] Bridge - Fix BPDU message_age

Fixes message_age field update in config BPDUs. Also checks whether the BPDU message age has exceeded bridge max age before transmitting config BPDUs.

Signed-off-by Kishore A K <[email protected]>

Index: linux-2.6.7/net/bridge/br_stp.c
=============================================================

net/bridge/br_stp.c renamed from net/bridge/br_stp.c.orig +8 -9
@@ -161,20 +161,19 @@ void br_transmit_config(struct net_bridg
 	if (!br_is_root_bridge(br)) {
 		struct net_bridge_port *root
 			= br_get_port(br, br->root_port);
-		bpdu.max_age = root->message_age_timer.expires - jiffies;
-
-		if (bpdu.max_age <= 0) bpdu.max_age = 1;
+		bpdu.message_age = br->max_age - 
+			(root->message_age_timer.expires - jiffies) + 1;
 	}
 	bpdu.max_age = br->max_age;
 	bpdu.hello_time = br->hello_time;
 	bpdu.forward_delay = br->forward_delay;
 
-	br_send_config_bpdu(p, &bpdu);
-
-	p->topology_change_ack = 0;
-	p->config_pending = 0;
-	
-	mod_timer(&p->hold_timer, jiffies + BR_HOLD_TIME);
+	if (bpdu.message_age < br->max_age) {
+		br_send_config_bpdu(p, &bpdu);
+		p->topology_change_ack = 0;
+		p->config_pending = 0;
+		mod_timer(&p->hold_timer, jiffies + BR_HOLD_TIME);
+	}
 }
 
 /* called under bridge lock */