TODO: squash review comments

dceara · Jul 31, 2024 · b3d67b5 · b3d67b5
1 parent 5239d3a
commit b3d67b5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/controller/chassis.c b/controller/chassis.c
@@ -341,7 +341,7 @@ chassis_parse_ovs_config(const struct ovsrec_open_vswitch_table *ovs_table,
 
     ovs_cfg->is_interconn = get_is_interconn(&cfg->external_ids, chassis_id);
     ovs_cfg->sample_with_regs =
-        ovs_feature_is_supported(OVS_DP_SAMPLE_REG_SUPPORT);
+        ovs_feature_is_supported(OVS_SAMPLE_REG_SUPPORT);
 
     return true;
 }

diff --git a/include/ovn/features.h b/include/ovn/features.h
@@ -40,7 +40,7 @@ enum ovs_feature_support_bits {
     OVS_CT_TUPLE_FLUSH_BIT,
     OVS_DP_HASH_L4_SYM_BIT,
     OVS_OF_GROUP_SUPPORT_BIT,
-    OVS_DP_SAMPLE_REG_SUPPORT_BIT,
+    OVS_SAMPLE_REG_SUPPORT_BIT,
 };
 
 enum ovs_feature_value {
@@ -49,7 +49,7 @@ enum ovs_feature_value {
     OVS_CT_TUPLE_FLUSH_SUPPORT = (1 << OVS_CT_TUPLE_FLUSH_BIT),
     OVS_DP_HASH_L4_SYM_SUPPORT = (1 << OVS_DP_HASH_L4_SYM_BIT),
     OVS_OF_GROUP_SUPPORT = (1 << OVS_OF_GROUP_SUPPORT_BIT),
-    OVS_DP_SAMPLE_REG_SUPPORT = (1 << OVS_DP_SAMPLE_REG_SUPPORT_BIT),
+    OVS_SAMPLE_REG_SUPPORT = (1 << OVS_SAMPLE_REG_SUPPORT_BIT),
 };
 
 void ovs_feature_support_destroy(void);

diff --git a/lib/features.c b/lib/features.c
@@ -284,7 +284,7 @@ static struct ovs_openflow_feature all_openflow_features[] = {
             .handle_barrier = default_barrier_response_handle,
         },
         {
-            .value = OVS_DP_SAMPLE_REG_SUPPORT,
+            .value = OVS_SAMPLE_REG_SUPPORT,
             .name = "sample_action_with_registers",
             .send_request = sample_with_reg_send_request,
             .handle_response = sample_with_reg_handle_response,
@@ -361,7 +361,7 @@ ovs_feature_is_valid(enum ovs_feature_value feature)
     case OVS_CT_TUPLE_FLUSH_SUPPORT:
     case OVS_DP_HASH_L4_SYM_SUPPORT:
     case OVS_OF_GROUP_SUPPORT:
-    case OVS_DP_SAMPLE_REG_SUPPORT:
+    case OVS_SAMPLE_REG_SUPPORT:
         return true;
     default:
         return false;