Skip to content

Commit

Permalink
Added SAI_OBJECT_TYPE_BRIDGE_PORT support in ACL (#756)
Browse files Browse the repository at this point in the history
* Removing condition in bridge port bridge id attribute (#706) (#707)

* Fix condition in bridge port bridge id attribute

* Updating based on comments

* Fix indentation

* Remove whitespace

* Fix tagging mode flags/comments (#708) (#709)

* Fix tagging mode flags/comments

* Using validonly flag

* Add validonly and range tags to Doxygen (#717)

* merge CRM commits to v1.2 (#726)

* add SAI_SWITCH_ATTR_AVAILABLE_ACL_{TABLE,TABLE_GROUP} (#721)

SAI_SWITCH_ATTR_AVAILABLE_ACL_TABLE counts the available entires
for ACL TABLE objects

SAI_SWITCH_ATTR_AVAILABLE_ACL_TABLE_GROUP counts the available
entries for ACL TABLE GROUP objects

* add SAI_SWITCH_ATTR_AVAILABLE_NEXT_HOP_GROUP_ENTRY (#722)

* ACL CRM changes (#731) (#733)

* Critical Resource Monitoring related changed for ACLs

* Adapt to new gcc and doxygen (#725)

* Fixed conditions for ENCAP_MAPPERS and DECAP_MAPPERS (#735) (#743)

* Fixed conditions for SAI_TUNNEL_ATTR_ENCAP_MAPPERS and SAI_TUNNEL_ATTR_DECAP_MAPPERS tunnel attributes
to attach to tunnel different types of mappers

Signed-off-by: Iurii Gordynskyi <Iurii.Gordynskyi@cavium.com>

* Removed the mandatory clause and gave a default of empty list
in SAI_TUNNEL_ATTR_ENCAP_MAPPERS and SAI_TUNNEL_ATTR_DECAP_MAPPERS definitions

Signed-off-by: Iurii Gordynskyi <Iurii.Gordynskyi@cavium.com>

* Add return flag in notification data structure. (#745)

* Add return flag in notification data structure.

Add return flag in notification data structure to indicate app behavior on every deadlock situation.

* Update saiqueue.h

* Update saiqueue.h

* Update saiqueue.h

* Update saiserializetest.c

* Update saiserializetest.c

* Update saiserializetest.c

* Update saiqueue.h

* Update saivlan.h (#752)

Updated attribute comment

* Added SAI_OBJECT_TYPE_BRIDGE_PORT support in ACL

* Keep SAI_OBJECT_TYPE_BRIDGE_PORT along with SAI_OBJECT_TYPE_PORT in saiacl.h
  • Loading branch information
manish-volansys authored and kcudnik committed Mar 27, 2018
1 parent e3b022c commit e472cc2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions inc/saiacl.h
Original file line number Diff line number Diff line change
Expand Up @@ -1195,7 +1195,7 @@ typedef enum _sai_acl_entry_attr_t
*
* @type sai_acl_field_data_t sai_object_list_t
* @flags CREATE_AND_SET
* @objects SAI_OBJECT_TYPE_PORT
* @objects SAI_OBJECT_TYPE_PORT, SAI_OBJECT_TYPE_BRIDGE_PORT
* @default disabled
*/
SAI_ACL_ENTRY_ATTR_FIELD_IN_PORTS,
Expand All @@ -1205,7 +1205,7 @@ typedef enum _sai_acl_entry_attr_t
*
* @type sai_acl_field_data_t sai_object_list_t
* @flags CREATE_AND_SET
* @objects SAI_OBJECT_TYPE_PORT
* @objects SAI_OBJECT_TYPE_PORT, SAI_OBJECT_TYPE_BRIDGE_PORT
* @default disabled
*/
SAI_ACL_ENTRY_ATTR_FIELD_OUT_PORTS,
Expand All @@ -1215,7 +1215,7 @@ typedef enum _sai_acl_entry_attr_t
*
* @type sai_acl_field_data_t sai_object_id_t
* @flags CREATE_AND_SET
* @objects SAI_OBJECT_TYPE_PORT
* @objects SAI_OBJECT_TYPE_PORT, SAI_OBJECT_TYPE_BRIDGE_PORT
* @default disabled
*/
SAI_ACL_ENTRY_ATTR_FIELD_IN_PORT,
Expand All @@ -1225,7 +1225,7 @@ typedef enum _sai_acl_entry_attr_t
*
* @type sai_acl_field_data_t sai_object_id_t
* @flags CREATE_AND_SET
* @objects SAI_OBJECT_TYPE_PORT
* @objects SAI_OBJECT_TYPE_PORT, SAI_OBJECT_TYPE_BRIDGE_PORT
* @default disabled
*/
SAI_ACL_ENTRY_ATTR_FIELD_OUT_PORT,
Expand All @@ -1236,7 +1236,7 @@ typedef enum _sai_acl_entry_attr_t
*
* @type sai_acl_field_data_t sai_object_id_t
* @flags CREATE_AND_SET
* @objects SAI_OBJECT_TYPE_PORT
* @objects SAI_OBJECT_TYPE_PORT, SAI_OBJECT_TYPE_BRIDGE_PORT
* @default disabled
*/
SAI_ACL_ENTRY_ATTR_FIELD_SRC_PORT,
Expand Down Expand Up @@ -1691,7 +1691,7 @@ typedef enum _sai_acl_entry_attr_t
*
* @type sai_acl_action_data_t sai_object_id_t
* @flags CREATE_AND_SET
* @objects SAI_OBJECT_TYPE_PORT, SAI_OBJECT_TYPE_LAG, SAI_OBJECT_TYPE_NEXT_HOP, SAI_OBJECT_TYPE_NEXT_HOP_GROUP, SAI_OBJECT_TYPE_BRIDGE_PORT, SAI_OBJECT_TYPE_L2MC_GROUP, SAI_OBJECT_TYPE_IPMC_GROUP
* @objects SAI_OBJECT_TYPE_PORT, SAI_OBJECT_TYPE_LAG, SAI_OBJECT_TYPE_NEXT_HOP, SAI_OBJECT_TYPE_NEXT_HOP_GROUP, SAI_OBJECT_TYPE_PORT, SAI_OBJECT_TYPE_BRIDGE_PORT, SAI_OBJECT_TYPE_L2MC_GROUP, SAI_OBJECT_TYPE_IPMC_GROUP
* @default disabled
*/
SAI_ACL_ENTRY_ATTR_ACTION_REDIRECT = SAI_ACL_ENTRY_ATTR_ACTION_START,
Expand All @@ -1714,7 +1714,7 @@ typedef enum _sai_acl_entry_attr_t
*
* @type sai_acl_action_data_t sai_object_list_t
* @flags CREATE_AND_SET
* @objects SAI_OBJECT_TYPE_PORT, SAI_OBJECT_TYPE_LAG, SAI_OBJECT_TYPE_NEXT_HOP, SAI_OBJECT_TYPE_NEXT_HOP_GROUP
* @objects SAI_OBJECT_TYPE_PORT, SAI_OBJECT_TYPE_BRIDGE_PORT, SAI_OBJECT_TYPE_LAG, SAI_OBJECT_TYPE_NEXT_HOP, SAI_OBJECT_TYPE_NEXT_HOP_GROUP
* @default disabled
*/
SAI_ACL_ENTRY_ATTR_ACTION_REDIRECT_LIST,
Expand Down Expand Up @@ -1972,7 +1972,7 @@ typedef enum _sai_acl_entry_attr_t
*
* @type sai_acl_action_data_t sai_object_list_t
* @flags CREATE_AND_SET
* @objects SAI_OBJECT_TYPE_PORT
* @objects SAI_OBJECT_TYPE_PORT, SAI_OBJECT_TYPE_BRIDGE_PORT
* @default disabled
*/
SAI_ACL_ENTRY_ATTR_ACTION_EGRESS_BLOCK_PORT_LIST,
Expand Down
2 changes: 1 addition & 1 deletion inc/saivlan.h
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ typedef enum _sai_vlan_attr_t
SAI_VLAN_ATTR_UNKNOWN_UNICAST_FLOOD_GROUP,

/**
* @brief Unknown unicast flood control type
* @brief Unknown multicast flood control type
*
* @type sai_vlan_flood_control_type_t
* @flags CREATE_AND_SET
Expand Down

0 comments on commit e472cc2

Please sign in to comment.