fix conflicts

Signed-off-by: Stepan Blyshchak <[email protected]>
sonic-net · Nov 22, 2021 · 70d2c7d · 70d2c7d
1 parent c7e8ac0
commit 70d2c7d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/orchagent/aclorch.cpp b/orchagent/aclorch.cpp
@@ -1164,7 +1164,7 @@ bool AclRule::setAction(sai_acl_entry_attr_t actionId, sai_acl_action_data_t act
 
     m_actions[actionId] = SaiAttrWrapper(SAI_OBJECT_TYPE_ACL_ENTRY, attr);
 
-    if (!m_pTable->validateAclRuleAction(attrId, *this))
+    if (!m_pTable->validateAclRuleAction(actionId, *this))
     {
         return false;
     }