Skip to content

[code sync] Merge code from sonic-net/sonic-swss:202511 to 202601 #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mssonicbld merged 2 commits into from
Jun 26, 2026
Merged

[code sync] Merge code from sonic-net/sonic-swss:202511 to 202601 #249

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7250b20
Fix orchagent Port PHY Serdes Invalid VID on Removal (#4706)
mssonicbld Jun 25, 2026
3e4e6bf
Merge branch '202511' of https://github.com/sonic-net/sonic-swss into…
mssonicbld Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions orchagent/portsorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10144,6 +10144,23 @@ bool PortsOrch::setPortSerdesAttribute(sai_object_id_t port_id, sai_object_id_t

if (port_attr.value.oid != SAI_NULL_OBJECT_ID)
{
// Remove old mapping from memory map
m_portIdToSerdesId.erase(port_id);

// Remove old mapping from COUNTERS_DB
m_portSerdesIdToPortIdTable->hdel("", sai_serialize_object_id(port_attr.value.oid));
SWSS_LOG_INFO("Removed old COUNTERS_PORT_SERDES_ID_TO_PORT_ID_MAP entry: serdes_id:0x%" PRIx64,
port_attr.value.oid);

// Clear the phy port serdes countersIDList
Port p;
if (getPort(port_id, p) && p.m_type == Port::Type::PHY &&
flex_counters_orch->getPortPhySerdesAttrCountersState())
{
port_phy_serdes_attr_manager.clearCounterIdList(port_attr.value.oid);
}

// Remove SAI port serdes object
status = sai_port_api->remove_port_serdes(port_attr.value.oid);
if (status != SAI_STATUS_SUCCESS)
{
Expand All @@ -10155,24 +10172,6 @@ bool PortsOrch::setPortSerdesAttribute(sai_object_id_t port_id, sai_object_id_t
return parseHandleSaiStatusFailure(handle_status);
}
}
else
{
// Remove old mapping from memory map
m_portIdToSerdesId.erase(port_id);

// Remove old mapping from COUNTERS_DB
m_portSerdesIdToPortIdTable->hdel("", sai_serialize_object_id(port_attr.value.oid));
SWSS_LOG_INFO("Removed old COUNTERS_PORT_SERDES_ID_TO_PORT_ID_MAP entry: serdes_id:0x%" PRIx64,
port_attr.value.oid);

//clear the phy port serdes countersIDList
Port p;
if (getPort(port_id, p) && p.m_type == Port::Type::PHY &&
flex_counters_orch->getPortPhySerdesAttrCountersState())
{
port_phy_serdes_attr_manager.clearCounterIdList(port_attr.value.oid);
}
}
}


Expand Down
Loading