Skip to content

Commit f484a2b

Browse files
committed
Generalize setBridgePortLearningFDB()
Signed-off-by: Qi Luo <[email protected]>
1 parent 758c4ac commit f484a2b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

orchagent/orchdaemon.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ void OrchDaemon::start()
367367
for (auto& pair: gPortsOrch->getAllPorts())
368368
{
369369
auto& port = pair.second;
370-
gPortsOrch->setBridgePortLearningFDB(port, false);
370+
gPortsOrch->setBridgePortLearningFDB(port, SAI_BRIDGE_PORT_FDB_LEARNING_MODE_DISABLE);
371371
}
372372
flush();
373373

orchagent/portsorch.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2312,7 +2312,7 @@ bool PortsOrch::addHostIntfs(Port &port, string alias, sai_object_id_t &host_int
23122312
return true;
23132313
}
23142314

2315-
bool PortsOrch::setBridgePortLearningFDB(Port &port, bool enable)
2315+
bool PortsOrch::setBridgePortLearningFDB(Port &port, sai_bridge_port_fdb_learning_mode_t mode)
23162316
{
23172317
// TODO: how to support 1D bridge?
23182318
if (port.m_type != Port::PHY) return false;
@@ -2322,7 +2322,7 @@ bool PortsOrch::setBridgePortLearningFDB(Port &port, bool enable)
23222322

23232323
sai_attribute_t bport_attr;
23242324
bport_attr.id = SAI_BRIDGE_PORT_ATTR_FDB_LEARNING_MODE;
2325-
bport_attr.value.s32 = enable ? SAI_BRIDGE_PORT_FDB_LEARNING_MODE_HW : SAI_BRIDGE_PORT_FDB_LEARNING_MODE_DISABLE;
2325+
bport_attr.value.s32 = mode;
23262326
auto status = sai_bridge_api->set_bridge_port_attribute(bridge_port_id, &bport_attr);
23272327
if (status != SAI_STATUS_SUCCESS)
23282328
{

orchagent/portsorch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class PortsOrch : public Orch, public Subject
5959
bool bake() override;
6060
void cleanPortTable(const vector<string>& keys);
6161
bool getBridgePort(sai_object_id_t id, Port &port);
62-
bool setBridgePortLearningFDB(Port &port, bool enable);
62+
bool setBridgePortLearningFDB(Port &port, sai_bridge_port_fdb_learning_mode_t mode);
6363
bool getPort(string alias, Port &port);
6464
bool getPort(sai_object_id_t id, Port &port);
6565
bool getPortByBridgePortId(sai_object_id_t bridge_port_id, Port &port);

0 commit comments

Comments
 (0)