Skip to content

Commit

Permalink
Rename function to createBindAclTableGroup()
Browse files Browse the repository at this point in the history
Signed-off-by: Wenda Ni <wenni@microsoft.com>
  • Loading branch information
wendani authored and localadmin committed Feb 10, 2019
1 parent acbc89c commit 076bf48
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions orchagent/pfcwdorch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -527,8 +527,8 @@ void PfcWdSwOrch<DropHandler, ForwardHandler>::registerInWdDb(const Port& port,
}

// Create egress ACL table group for each port of pfcwd's interest
sai_object_id_t group_oid;
gPortsOrch->bindAclTableGroup(port.m_port_id, group_oid, ACL_STAGE_EGRESS);
sai_object_id_t groupId;
gPortsOrch->createBindAclTableGroup(port.m_port_id, groupId, ACL_STAGE_EGRESS);
}

template <typename DropHandler, typename ForwardHandler>
Expand Down
4 changes: 2 additions & 2 deletions orchagent/portsorch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ bool PortsOrch::setPortPfcAsym(Port &port, string pfc_asym)
return true;
}

bool PortsOrch::bindAclTableGroup(sai_object_id_t id, sai_object_id_t &group_oid, acl_stage_type_t acl_stage)
bool PortsOrch::createBindAclTableGroup(sai_object_id_t id, sai_object_id_t &group_oid, acl_stage_type_t acl_stage)
{
SWSS_LOG_ENTER();

Expand Down Expand Up @@ -864,7 +864,7 @@ bool PortsOrch::bindAclTable(sai_object_id_t id, sai_object_id_t table_oid, sai_
sai_object_id_t groupOid;

// Create an ACL table group and bind to port
if (!bindAclTableGroup(id, groupOid, acl_stage))
if (!createBindAclTableGroup(id, groupOid, acl_stage))
{
SWSS_LOG_ERROR("Fail to create or bind to port %lx ACL table group", id);
return false;
Expand Down
2 changes: 1 addition & 1 deletion orchagent/portsorch.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class PortsOrch : public Orch, public Subject

bool setHostIntfsOperStatus(const Port& port, bool up) const;
void updateDbPortOperStatus(const Port& port, sai_port_oper_status_t status) const;
bool bindAclTableGroup(sai_object_id_t id, sai_object_id_t &group_oid, acl_stage_type_t acl_stage = ACL_STAGE_EGRESS);
bool createBindAclTableGroup(sai_object_id_t id, sai_object_id_t &group_oid, acl_stage_type_t acl_stage = ACL_STAGE_EGRESS);
bool bindAclTable(sai_object_id_t id, sai_object_id_t table_oid, sai_object_id_t &group_member_oid, acl_stage_type_t acl_stage = ACL_STAGE_INGRESS);

bool getPortPfc(sai_object_id_t portId, uint8_t *pfc_bitmask);
Expand Down

0 comments on commit 076bf48

Please sign in to comment.