Merge branch 'sonic-net:main' into pr-fix-sai_thrift-import-error

sonic-net · Nov 5, 2024 · b025fc5 · b025fc5
2 parents 09dac7f + ee1fa23
commit b025fc5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/dash-pipeline/bmv2/dash_pipeline.p4 b/dash-pipeline/bmv2/dash_pipeline.p4
@@ -234,7 +234,6 @@ control dash_ingress(
     }
 
     apply {
-        meta.flow_enabled = false;
 
 #ifndef TARGET_DPDK_PNA
         meta.rx_encap.setValid();

diff --git a/dash-pipeline/bmv2/stages/pre_pipeline.p4 b/dash-pipeline/bmv2/stages/pre_pipeline.p4
@@ -25,21 +25,23 @@ control pre_pipeline_stage(inout headers_t hdr,
         const default_action = accept;
     }
 
-    action set_underlay_mac(EthernetAddress neighbor_mac,
-                            EthernetAddress mac) {
+    action set_internal_config(EthernetAddress neighbor_mac,
+                            EthernetAddress mac,
+                            bit<1> flow_enabled) {
         meta.u0_encap_data.underlay_dmac = neighbor_mac;
         meta.u0_encap_data.underlay_smac = mac;
+        meta.flow_enabled = (bool)flow_enabled;
     }
 
-    /* This table API should be implemented manually using underlay SAI */
+    /* This table API should be implemented manually using SAI */
     @SaiTable[ignored = "true"]
-    table underlay_mac {
+    table internal_config {
         key = {
             meta.appliance_id : ternary;
         }
 
         actions = {
-            set_underlay_mac;
+            set_internal_config;
         }
     }
 
@@ -120,7 +122,7 @@ control pre_pipeline_stage(inout headers_t hdr,
         }
 
         appliance.apply();
-        underlay_mac.apply();
+        internal_config.apply();
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -234,7 +234,6 @@ control dash_ingress( @@
         }
         apply {
-            meta.flow_enabled = false;
     #ifndef TARGET_DPDK_PNA
             meta.rx_encap.setValid();
@@ Expand Down @@