gitproxy/RTLPlayground
1
0
Fork 0
mirror of https://github.com/logicog/RTLPlayground.git synced 2026-09-02 15:02:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

stp: do not carry a dropped BPDU's flags over to the next one

Browse Source 
The Topology Change Acknowledgment is staged in a one-shot variable and
consumed when the BPDU is built - but stp_cnf_send() can return before
that, when the port is filtered/tripped or its tx-hold budget for this
second is spent. The flag then survived and was OR-ed into the next BPDU
this switch sent, on whatever port that happened to be. Clear it with
the frame it belonged to.
This commit is contained in:
d00f
2026-08-18 23:28:31 +02:00
committed by d00f
parent b51ed71bb1
commit f1f69e26fd
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rtl837x_stp.c
+8 -2
View File
@@ -214,10 +214,16 @@ static void stp_claim_root(void)
void stp_cnf_send(uint8_t port) __reentrant void stp_cnf_send(uint8_t port) __reentrant
{ {
if (!(stp_pflags[port] & STP_PF_ENABLED) || (stp_pflags[port] & (STP_PF_FILTER | STP_PF_TRIPPED))) /* A one-shot flag (TCA) belongs to the BPDU we were asked to send: drop
* it with the frame, or it would surface on an unrelated port later. */
if (!(stp_pflags[port] & STP_PF_ENABLED) || (stp_pflags[port] & (STP_PF_FILTER | STP_PF_TRIPPED))) {
stp_tx_flags_extra = 0;
return; return;
if (!stp_tx_budget[port]) /* tx hold count exhausted for this second */ }
if (!stp_tx_budget[port]) { /* tx hold count exhausted for this second */
stp_tx_flags_extra = 0;
return; return;
}
stp_tx_budget[port]--; stp_tx_budget[port]--;
STP_O->stp_addr[0] = 0x01; STP_O->stp_addr[1] = 0x80; STP_O->stp_addr[2] = 0xc2; STP_O->stp_addr[0] = 0x01; STP_O->stp_addr[1] = 0x80; STP_O->stp_addr[2] = 0xc2;