From 80616c69707eaf4db3fddbb7b5f4457363ad984b Mon Sep 17 00:00:00 2001 From: Andriy Yurkiv Date: Fri, 17 Jan 2025 14:17:20 +0200 Subject: [PATCH] [hash] update ECMP/LAG hash VS lib with SAI_NATIVE_HASH_FIELD_IPV6_FLOW_LABEL Signed-off-by: Andriy Yurkiv --- syncd/tests/TestSyncdMlnx.cpp | 3 ++- unittest/vslib/TestSwitchStateBase.cpp | 3 ++- vslib/SwitchStateBase.cpp | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/syncd/tests/TestSyncdMlnx.cpp b/syncd/tests/TestSyncdMlnx.cpp index 3c0c852c63..f425409511 100644 --- a/syncd/tests/TestSyncdMlnx.cpp +++ b/syncd/tests/TestSyncdMlnx.cpp @@ -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 hfSet2; diff --git a/unittest/vslib/TestSwitchStateBase.cpp b/unittest/vslib/TestSwitchStateBase.cpp index 7772f67311..b56f49603c 100644 --- a/unittest/vslib/TestSwitchStateBase.cpp +++ b/unittest/vslib/TestSwitchStateBase.cpp @@ -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 hfSet2; diff --git a/vslib/SwitchStateBase.cpp b/vslib/SwitchStateBase.cpp index 7aeacf04f9..2cad8c568d 100644 --- a/vslib/SwitchStateBase.cpp +++ b/vslib/SwitchStateBase.cpp @@ -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; @@ -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; }