Merge branch 'sonic-net:master' into ledamping

sonic-net · Oct 23, 2023 · f05df69 · f05df69
2 parents b7160df + eaa2bda
commit f05df69
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/SAI b/SAI
diff --git a/syncd/SwitchNotifications.h b/syncd/SwitchNotifications.h
@@ -84,18 +84,18 @@ namespace syncd
 
                 Slot():
                     SlotBase({
-                            .on_bfd_session_state_change = &Slot<context>::onBfdSessionStateChange,
+                            .on_switch_state_change = &Slot<context>::onSwitchStateChange,
+                            .on_switch_shutdown_request = &Slot<context>::onSwitchShutdownRequest,
                             .on_fdb_event = &Slot<context>::onFdbEvent,
-                            .on_ipsec_sa_status_change = nullptr,
-                            .on_nat_event = &Slot<context>::onNatEvent,
-                            .on_packet_event = nullptr,
-                            .on_port_host_tx_ready = nullptr,
                             .on_port_state_change = &Slot<context>::onPortStateChange,
+                            .on_packet_event = nullptr,
                             .on_queue_pfc_deadlock = &Slot<context>::onQueuePfcDeadlock,
-                            .on_switch_asic_sdk_health_event = nullptr,
-                            .on_switch_shutdown_request = &Slot<context>::onSwitchShutdownRequest,
-                            .on_switch_state_change = &Slot<context>::onSwitchStateChange,
+                            .on_bfd_session_state_change = &Slot<context>::onBfdSessionStateChange,
                             .on_tam_event = nullptr,
+                            .on_ipsec_sa_status_change = nullptr,
+                            .on_nat_event = &Slot<context>::onNatEvent,
+                            .on_switch_asic_sdk_health_event = nullptr,
+                            .on_port_host_tx_ready = nullptr,
                             .on_twamp_session_event = nullptr,
                             }) { }
+1 −1		bm/README.md
+1 −1		bm/build_p4_target.sh
+1 −0		inc/saiport.h
+1 −1		inc/saitunnel.h
+50 −18		meta/parse.pl
+934 −885		meta/sai_rpc_frontend.cpp
+18 −13		meta/saidepgraphgen.cpp
+5 −0		meta/saimetadatautils.c
+7 −0		meta/saimetadatautils.h
+33 −0		meta/saisanitycheck.c
+15 −8		meta/serialize.pm
+3 −3		meta/test.pm
+2 −4		test/saithriftv2/Makefile