summaryrefslogtreecommitdiff
path: root/ofproto
diff options
context:
space:
mode:
authorAndy Zhou <azhou@ovn.org>2017-07-13 16:12:41 -0700
committerAndy Zhou <azhou@ovn.org>2017-08-03 12:38:32 -0700
commitce15b514a6de816845a46ee7bb74f37aad1a0582 (patch)
tree0f7b498622878edcb1d1f97b90e5452b6b4e0528 /ofproto
parent88186383f36ca4e3708c9737f43c5e8908cd58d8 (diff)
downloadopenvswitch-ce15b514a6de816845a46ee7bb74f37aad1a0582.tar.gz
ofproto-dpif: Remove dpif/disable-dp-clone command.
Use 'dpif/set-dp-features' command instead. Signed-off-by: Andy Zhou <azhou@ovn.org> Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ofproto')
-rw-r--r--ofproto/ofproto-dpif-xlate.c11
-rw-r--r--ofproto/ofproto-dpif-xlate.h1
-rw-r--r--ofproto/ofproto-dpif.c24
3 files changed, 0 insertions, 36 deletions
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index d78fca1fe..06c9b9afd 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -7106,17 +7106,6 @@ xlate_mac_learning_update(const struct ofproto_dpif *ofproto,
}
void
-xlate_disable_dp_clone(const struct ofproto_dpif *ofproto)
-{
- struct xlate_cfg *xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp);
- struct xbridge *xbridge = xbridge_lookup(xcfg, ofproto);
-
- if (xbridge) {
- xbridge->support.clone = false;
- }
-}
-
-void
xlate_set_support(const struct ofproto_dpif *ofproto,
const struct dpif_backer_support *support)
{
diff --git a/ofproto/ofproto-dpif-xlate.h b/ofproto/ofproto-dpif-xlate.h
index 916a15c67..a299d109f 100644
--- a/ofproto/ofproto-dpif-xlate.h
+++ b/ofproto/ofproto-dpif-xlate.h
@@ -233,7 +233,6 @@ void xlate_mac_learning_update(const struct ofproto_dpif *ofproto,
ofp_port_t in_port, struct eth_addr dl_src,
int vlan, bool is_grat_arp);
-void xlate_disable_dp_clone(const struct ofproto_dpif *);
void xlate_set_support(const struct ofproto_dpif *,
const struct dpif_backer_support *);
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index a41847d02..9fe10f8e8 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -5522,27 +5522,6 @@ disable_datapath_truncate(struct unixctl_conn *conn OVS_UNUSED,
}
static void
-disable_datapath_clone(struct unixctl_conn *conn OVS_UNUSED,
- int argc, const char *argv[],
- void *aux OVS_UNUSED)
-{
- struct ds ds = DS_EMPTY_INITIALIZER;
- const char *br = argv[argc -1];
- struct ofproto_dpif *ofproto;
-
- ofproto = ofproto_dpif_lookup(br);
- if (!ofproto) {
- unixctl_command_reply_error(conn, "no such bridge");
- return;
- }
- xlate_disable_dp_clone(ofproto);
- udpif_flush(ofproto->backer->udpif);
- ds_put_format(&ds, "Datapath clone action disabled for bridge %s", br);
- unixctl_command_reply(conn, ds_cstr(&ds));
- ds_destroy(&ds);
-}
-
-static void
ofproto_unixctl_dpif_show_dp_features(struct unixctl_conn *conn,
int argc, const char *argv[],
void *aux OVS_UNUSED)
@@ -5622,9 +5601,6 @@ ofproto_unixctl_init(void)
unixctl_command_register("dpif/disable-truncate", "", 0, 0,
disable_datapath_truncate, NULL);
-
- unixctl_command_register("dpif/disable-dp-clone", "bridge", 1, 1,
- disable_datapath_clone, NULL);
}
static odp_port_t