Skip to content

Enable proto_mode handling code#75

Merged
divyachandralekha merged 3 commits intosonic-net:masterfrom
divyachandralekha:test_pvst
Nov 26, 2025
Merged

Enable proto_mode handling code#75
divyachandralekha merged 3 commits intosonic-net:masterfrom
divyachandralekha:test_pvst

Conversation

@divyachandralekha
Copy link
Contributor

@divyachandralekha divyachandralekha commented Nov 14, 2025

What was added

  • Introduced logic to handle proto_mode in STP processing: distinguishing between modes like L2_PVSTP, L2_MSTP, etc.
  • In mstp.c, changed sequence of conditionals in mstp_updtRolesCist() and other MSTP-branching code.
  • In stp_intf.c and stp_mgr.c, re-enabled or reorganized branches that were previously commented out (for example, handling of msg->proto_mode).
  • In bitmap.c and bitmap.h, adjusted data structures or handling to support new mode logic (e.g., changes in how bitmaps are allocated or referenced).
  • In include/stp.h, modified struct definitions or macros to include proto_mode as a field (or variant) to make mode-aware processing possible.

Verified

  • Ensure proto_mode is correctly set in incoming messages and used in processing (for STP_BRIDGE_CONFIG, STP_PORT_CONFIG, STP_MST_VLAN_PORT_LIST_CONFIG, etc.).
  • Confirm no regressions in PVST functionality while MSTP mode is added/enabled.
  • Verify memory/bitmap operations did not break after changes in bitmap.c/h (allocation, count bits, print, etc.).
  • Validate build, unit tests for PVST and MSTP

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@divyachandralekha divyachandralekha marked this pull request as ready for review November 19, 2025 11:44
@divyachandralekha
Copy link
Contributor Author

@skulambi-cisco , Please review and approve

@divyachandralekha
Copy link
Contributor Author

@muhammadalihussnain Please review

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@divyachandralekha divyachandralekha merged commit 6dc2791 into sonic-net:master Nov 26, 2025
1 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants