Skip to content
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

[swss] L2 Forwarding Enhancements #1716

Merged
merged 15 commits into from
Nov 20, 2021
Merged

[swss] L2 Forwarding Enhancements #1716

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
047841e
PR1
dr412113 Mar 31, 2021
b19d1c6
Revert "PR1"
dr412113 Apr 5, 2021
2ca19c3
L2 forwarding enhancements
dr412113 Mar 31, 2021
34cec7b
Fix armhf compilation issue
dr412113 Apr 20, 2021
eace766
Fix Learn Mode config failure
dr412113 Apr 22, 2021
5f166a2
updated as per review comments
anilkpan Oct 27, 2021
015317e
Merge remote-tracking branch 'upstream/master'
anilkpan Oct 28, 2021
5d0ee12
Update fdborch.cpp
anilkpan Oct 29, 2021
26fdd6c
Updated as per review comments
anilkpandey Nov 9, 2021
3008db6
updated as per review comments
anilkpandey Nov 11, 2021
12be1fb
Update orch.cpp
anilkpandey Nov 11, 2021
d1c52aa
Merge remote-tracking branch 'upstream/master'
anilkpandey Nov 16, 2021
902a621
fix compile issue
anilkpandey Nov 16, 2021
1479667
Merge remote-tracking branch 'upstream/master'
anilkpandey Nov 18, 2021
f038961
Merge remote-tracking branch 'upstream/master'
anilkpandey Nov 19, 2021
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
8 changes: 3 additions & 5 deletions orchagent/fdborch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,10 +874,6 @@ void FdbOrch::doTask(NotificationConsumer& consumer)
{
if (op == "ALL")
{
/*
* so far only support flush all the FDB entries
* flush per port and flush per vlan will be added later.
*/
status = sai_fdb_api->flush_fdb_entries(gSwitchId, 0, NULL);
if (status != SAI_STATUS_SUCCESS)
{
Expand Down Expand Up @@ -1080,7 +1076,9 @@ void FdbOrch::updatePortOperState(const PortOperStateUpdate& update)

// Get BVID of each VLAN that this port is a member of
// and call notifyObserversFDBFlush
for (const auto& vlan_member: p.m_vlan_members)
vlan_members_t vlan_members;
m_portsOrch->getPortVlanMembers(p, vlan_members);
for (const auto& vlan_member: vlan_members)
{
swss::Port vlan;
string vlan_alias = VLAN_PREFIX + to_string(vlan_member.first);
Expand Down
2 changes: 1 addition & 1 deletion orchagent/port.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ class Port
VlanInfo m_vlan_info;
MacAddress m_mac;
sai_object_id_t m_bridge_port_id = 0; // TODO: port could have multiple bridge port IDs
sai_object_id_t m_bridge_port_admin_state = 0; // TODO: port could have multiple bridge port IDs
sai_vlan_id_t m_port_vlan_id = DEFAULT_PORT_VLAN_ID; // Port VLAN ID
sai_object_id_t m_rif_id = 0;
sai_object_id_t m_vr_id = 0;
Expand All @@ -130,7 +131,6 @@ class Port
sai_object_id_t m_tunnel_id = 0;
sai_object_id_t m_ingress_acl_table_group_id = 0;
sai_object_id_t m_egress_acl_table_group_id = 0;
vlan_members_t m_vlan_members;
sai_object_id_t m_parent_port_id = 0;
uint32_t m_dependency_bitmap = 0;
sai_port_oper_status_t m_oper_status = SAI_PORT_OPER_STATUS_UNKNOWN;
Expand Down
Loading