From 5c05e23a1b9ffcccc7c1c3ea26d37aa8fe79fc75 Mon Sep 17 00:00:00 2001 From: Kamil Cudnik Date: Wed, 21 Feb 2024 01:34:42 +0100 Subject: [PATCH] [SAI] Move SAI submodule to v1.13.3 (#1349) --- SAI | 2 +- lib/sai_redis_router_interface.cpp | 2 -- syncd/SwitchNotifications.h | 16 ++++++++-------- vslib/sai_vs_router_interface.cpp | 2 -- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/SAI b/SAI index 96143eef..ef2e5913 160000 --- a/SAI +++ b/SAI @@ -1 +1 @@ -Subproject commit 96143eef4a662b720038a10e68d7d702370dc20a +Subproject commit ef2e59130e35d9f19f9c9e97ff68988f8e05d906 diff --git a/lib/sai_redis_router_interface.cpp b/lib/sai_redis_router_interface.cpp index 1e77427e..feab7584 100644 --- a/lib/sai_redis_router_interface.cpp +++ b/lib/sai_redis_router_interface.cpp @@ -2,11 +2,9 @@ REDIS_GENERIC_QUAD(ROUTER_INTERFACE,router_interface); REDIS_GENERIC_STATS(ROUTER_INTERFACE,router_interface); -REDIS_BULK_QUAD(ROUTER_INTERFACE,router_interfaces); const sai_router_interface_api_t redis_router_interface_api = { REDIS_GENERIC_QUAD_API(router_interface) REDIS_GENERIC_STATS_API(router_interface) - REDIS_BULK_QUAD_API(router_interfaces) }; diff --git a/syncd/SwitchNotifications.h b/syncd/SwitchNotifications.h index f289936e..2c40595b 100644 --- a/syncd/SwitchNotifications.h +++ b/syncd/SwitchNotifications.h @@ -91,18 +91,18 @@ namespace syncd Slot(): SlotBase({ - .on_switch_state_change = &Slot::onSwitchStateChange, - .on_switch_shutdown_request = &Slot::onSwitchShutdownRequest, - .on_fdb_event = &Slot::onFdbEvent, - .on_port_state_change = &Slot::onPortStateChange, - .on_packet_event = nullptr, - .on_queue_pfc_deadlock = &Slot::onQueuePfcDeadlock, .on_bfd_session_state_change = &Slot::onBfdSessionStateChange, - .on_tam_event = nullptr, + .on_fdb_event = &Slot::onFdbEvent, .on_ipsec_sa_status_change = nullptr, .on_nat_event = &Slot::onNatEvent, - .on_switch_asic_sdk_health_event = nullptr, + .on_packet_event = nullptr, .on_port_host_tx_ready = &Slot::onPortHostTxReady, + .on_port_state_change = &Slot::onPortStateChange, + .on_queue_pfc_deadlock = &Slot::onQueuePfcDeadlock, + .on_switch_asic_sdk_health_event = nullptr, + .on_switch_shutdown_request = &Slot::onSwitchShutdownRequest, + .on_switch_state_change = &Slot::onSwitchStateChange, + .on_tam_event = nullptr, .on_twamp_session_event = nullptr, }) { } diff --git a/vslib/sai_vs_router_interface.cpp b/vslib/sai_vs_router_interface.cpp index df8bfeaa..81081368 100644 --- a/vslib/sai_vs_router_interface.cpp +++ b/vslib/sai_vs_router_interface.cpp @@ -2,11 +2,9 @@ VS_GENERIC_QUAD(ROUTER_INTERFACE,router_interface); VS_GENERIC_STATS(ROUTER_INTERFACE,router_interface); -VS_BULK_QUAD(ROUTER_INTERFACE,router_interfaces); const sai_router_interface_api_t vs_router_interface_api = { VS_GENERIC_QUAD_API(router_interface) VS_GENERIC_STATS_API(router_interface) - VS_BULK_QUAD_API(router_interfaces) };