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.

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

[hash] update ECMP/LAG hash VS lib with SAI_NATIVE_HASH_FIELD_IPV6_FLOW_LABEL #1508

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion syncd/tests/TestSyncdMlnx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ TEST_F(SyncdMlnxTest, queryAttrEnumValuesCapability)
SAI_NATIVE_HASH_FIELD_INNER_DST_IP,
SAI_NATIVE_HASH_FIELD_INNER_SRC_IP,
SAI_NATIVE_HASH_FIELD_INNER_L4_DST_PORT,
SAI_NATIVE_HASH_FIELD_INNER_L4_SRC_PORT
SAI_NATIVE_HASH_FIELD_INNER_L4_SRC_PORT,
SAI_NATIVE_HASH_FIELD_IPV6_FLOW_LABEL
};

std::set<sai_native_hash_field_t> hfSet2;
Expand Down
3 changes: 2 additions & 1 deletion unittest/vslib/TestSwitchStateBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ TEST_F(SwitchStateBaseTest, switchHashCapabilitiesGet)
SAI_NATIVE_HASH_FIELD_INNER_DST_IP,
SAI_NATIVE_HASH_FIELD_INNER_SRC_IP,
SAI_NATIVE_HASH_FIELD_INNER_L4_DST_PORT,
SAI_NATIVE_HASH_FIELD_INNER_L4_SRC_PORT
SAI_NATIVE_HASH_FIELD_INNER_L4_SRC_PORT,
SAI_NATIVE_HASH_FIELD_IPV6_FLOW_LABEL
};

std::set<sai_native_hash_field_t> hfSet2;
Expand Down
7 changes: 4 additions & 3 deletions vslib/SwitchStateBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3758,13 +3758,13 @@ sai_status_t SwitchStateBase::queryHashNativeHashFieldListCapability(
{
SWSS_LOG_ENTER();

if (enum_values_capability->count < 18)
if (enum_values_capability->count < 19)
{
enum_values_capability->count = 18;
enum_values_capability->count = 19;
return SAI_STATUS_BUFFER_OVERFLOW;
}

enum_values_capability->count = 18;
enum_values_capability->count = 19;
enum_values_capability->list[0] = SAI_NATIVE_HASH_FIELD_IN_PORT;
enum_values_capability->list[1] = SAI_NATIVE_HASH_FIELD_DST_MAC;
enum_values_capability->list[2] = SAI_NATIVE_HASH_FIELD_SRC_MAC;
Expand All @@ -3783,6 +3783,7 @@ sai_status_t SwitchStateBase::queryHashNativeHashFieldListCapability(
enum_values_capability->list[15] = SAI_NATIVE_HASH_FIELD_INNER_SRC_IP;
enum_values_capability->list[16] = SAI_NATIVE_HASH_FIELD_INNER_L4_DST_PORT;
enum_values_capability->list[17] = SAI_NATIVE_HASH_FIELD_INNER_L4_SRC_PORT;
enum_values_capability->list[18] = SAI_NATIVE_HASH_FIELD_IPV6_FLOW_LABEL;

return SAI_STATUS_SUCCESS;
}
Expand Down
Loading