Skip to content

Fix orch stuch when removing vlan member (#3294) #3295

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix orch stuch when removing vlan member (#3294) #3295

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffbe7b0
Fix orch stuch when removing vlan member (#3294)
Yang-Yongzhi Sep 20, 2024
611a78b
Merge branch 'master' into orch-stuck-when-remove-vlan-member
Yang-Yongzhi Sep 25, 2024
c88e7cc
Merge branch 'master' into orch-stuck-when-remove-vlan-member
Yang-Yongzhi Dec 24, 2024
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
5 changes: 1 addition & 4 deletions orchagent/portsorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6833,10 +6833,7 @@ bool PortsOrch::removeVlanMember(Port &vlan, Port &port, string end_point_ip)
/* Restore to default pvid if this port joined this VLAN in untagged mode previously */
if (sai_tagging_mode == SAI_VLAN_TAGGING_MODE_UNTAGGED)
{
if (!setPortPvid(port, DEFAULT_PORT_VLAN_ID))
{
return false;
}
setPortPvid(port, DEFAULT_PORT_VLAN_ID);
}

m_portList[port.m_alias] = port;
Expand Down
Loading