diff mbox

[ovs-dev,05/27] ovn-sbctl, ovn-nbctl, ovs-vsctl: Remove useless record id methods.

Message ID 20170430232231.15151-6-blp@ovn.org
State Accepted
Headers show

Commit Message

Ben Pfaff April 30, 2017, 11:22 p.m. UTC 
These only did anything if both the first two members of the struct were
nonnull, as you can see from the first test in get_row_by_id() in
lib/db-ctl-base.c, so these never did anything useful and I can't figure
out why they're there.

Signed-off-by: Ben Pfaff <blp@ovn.org>
---
 ovn/utilities/ovn-nbctl.c |  3 ---
 ovn/utilities/ovn-sbctl.c |  7 -------
 utilities/ovs-vsctl.c     | 16 +++++-----------
 3 files changed, 5 insertions(+), 21 deletions(-)
diff mbox

Patch

diff --git a/ovn/utilities/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c
index 476b03e57c72..89db0d8386da 100644
--- a/ovn/utilities/ovn-nbctl.c
+++ b/ovn/utilities/ovn-nbctl.c
@@ -3060,9 +3060,6 @@  static const struct ctl_table_class tables[NBREC_N_TABLES] = {
 
     [NBREC_TABLE_ADDRESS_SET].row_ids[0]
     = {&nbrec_table_address_set, &nbrec_address_set_col_name, NULL},
-
-    [NBREC_TABLE_SSL].row_ids[0]
-    = {&nbrec_table_nb_global, NULL, &nbrec_nb_global_col_ssl},
 };
 
 static void
diff --git a/ovn/utilities/ovn-sbctl.c b/ovn/utilities/ovn-sbctl.c
index ac37d6014838..168a5cc881bf 100644
--- a/ovn/utilities/ovn-sbctl.c
+++ b/ovn/utilities/ovn-sbctl.c
@@ -1053,10 +1053,6 @@  static const struct ctl_table_class tables[SBREC_N_TABLES] = {
     [SBREC_TABLE_CHASSIS].row_ids[0] =
     {&sbrec_table_chassis, &sbrec_chassis_col_name, NULL},
 
-    [SBREC_TABLE_LOGICAL_FLOW].row_ids[0] =
-     {&sbrec_table_logical_flow, NULL,
-      &sbrec_logical_flow_col_logical_datapath},
-
     [SBREC_TABLE_PORT_BINDING].row_ids[0] =
     {&sbrec_table_port_binding, &sbrec_port_binding_col_logical_port, NULL},
 
@@ -1065,9 +1061,6 @@  static const struct ctl_table_class tables[SBREC_N_TABLES] = {
 
     [SBREC_TABLE_ADDRESS_SET].row_ids[0] =
     {&sbrec_table_address_set, &sbrec_address_set_col_name, NULL},
-
-    [SBREC_TABLE_SSL].row_ids[0] =
-    {&sbrec_table_sb_global, NULL, &sbrec_sb_global_col_ssl},
 };
 
 
diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c
index 84176dea99d3..ed2145538e6f 100644
--- a/utilities/ovs-vsctl.c
+++ b/utilities/ovs-vsctl.c
@@ -2291,10 +2291,8 @@  cmd_get_aa_mapping(struct ctl_context *ctx)
 
 
 static const struct ctl_table_class tables[OVSREC_N_TABLES] = {
-    [OVSREC_TABLE_BRIDGE].row_ids = {
-        {&ovsrec_table_bridge, &ovsrec_bridge_col_name, NULL},
-        {&ovsrec_table_flow_sample_collector_set, NULL,
-         &ovsrec_flow_sample_collector_set_col_bridge}},
+    [OVSREC_TABLE_BRIDGE].row_ids[0] = {
+        {&ovsrec_table_bridge, &ovsrec_bridge_col_name, NULL}},
 
     [OVSREC_TABLE_CONTROLLER].row_ids[0]
     = {&ovsrec_table_bridge, &ovsrec_bridge_col_name,
@@ -2319,9 +2317,6 @@  static const struct ctl_table_class tables[OVSREC_N_TABLES] = {
     [OVSREC_TABLE_QOS].row_ids[0]
     = {&ovsrec_table_port, &ovsrec_port_col_name, &ovsrec_port_col_qos},
 
-    [OVSREC_TABLE_SSL].row_ids[0]
-    = {&ovsrec_table_open_vswitch, NULL, &ovsrec_open_vswitch_col_ssl},
-
     [OVSREC_TABLE_SFLOW].row_ids[0]
     = {&ovsrec_table_bridge, &ovsrec_bridge_col_name,
        &ovsrec_bridge_col_sflow},
@@ -2329,10 +2324,9 @@  static const struct ctl_table_class tables[OVSREC_N_TABLES] = {
     [OVSREC_TABLE_FLOW_TABLE].row_ids[0]
     = {&ovsrec_table_flow_table, &ovsrec_flow_table_col_name, NULL},
 
-    [OVSREC_TABLE_IPFIX].row_ids = {
-     {&ovsrec_table_bridge, &ovsrec_bridge_col_name, &ovsrec_bridge_col_ipfix},
-     {&ovsrec_table_flow_sample_collector_set, NULL,
-      &ovsrec_flow_sample_collector_set_col_ipfix}},
+    [OVSREC_TABLE_IPFIX].row_ids[0] = {
+     {&ovsrec_table_bridge, &ovsrec_bridge_col_name,
+      &ovsrec_bridge_col_ipfix}},
 
     [OVSREC_TABLE_AUTOATTACH].row_ids[0]
     = {&ovsrec_table_bridge, &ovsrec_bridge_col_name,