diff options
| author | Ben Pfaff <blp@ovn.org> | 2016-12-01 16:34:03 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2016-12-02 09:09:32 -0800 |
| commit | 817fd2f26d41cbd0aeba5dac432bebce6b0c371e (patch) | |
| tree | 09bcebcf2194780a1eea493dfb2bbda00e368094 /ovn | |
| parent | ab53d22ce95458d4ecdfdf672407f32359327c94 (diff) | |
| download | openvswitch-817fd2f26d41cbd0aeba5dac432bebce6b0c371e.tar.gz | |
ovn-controller: Remove unused members from local_datapath.
Nothing used these, except to initialize and free them. 'logical_port'
wasn't meaningful in any case, it was just the name of the first logical
port encountered from a particular logical datapath when traversing the
database's Port_Binding table, which isn't in a meaningful order.
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Mickey Spiegel <mickeys.dev@gmail.com>
Diffstat (limited to 'ovn')
| -rw-r--r-- | ovn/controller/binding.c | 2 | ||||
| -rw-r--r-- | ovn/controller/ovn-controller.c | 1 | ||||
| -rw-r--r-- | ovn/controller/ovn-controller.h | 3 |
3 files changed, 0 insertions, 6 deletions
diff --git a/ovn/controller/binding.c b/ovn/controller/binding.c index d7b175e6f..fb76032f9 100644 --- a/ovn/controller/binding.c +++ b/ovn/controller/binding.c @@ -114,8 +114,6 @@ add_local_datapath(struct hmap *local_datapaths, } struct local_datapath *ld = xzalloc(sizeof *ld); - ld->logical_port = xstrdup(binding_rec->logical_port); - memcpy(&ld->uuid, &binding_rec->header_.uuid, sizeof ld->uuid); hmap_insert(local_datapaths, &ld->hmap_node, binding_rec->datapath->tunnel_key); } diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c index c9dc2aae3..fea7841c5 100644 --- a/ovn/controller/ovn-controller.c +++ b/ovn/controller/ovn-controller.c @@ -566,7 +566,6 @@ main(int argc, char *argv[]) struct local_datapath *cur_node, *next_node; HMAP_FOR_EACH_SAFE (cur_node, next_node, hmap_node, &local_datapaths) { hmap_remove(&local_datapaths, &cur_node->hmap_node); - free(cur_node->logical_port); free(cur_node); } hmap_destroy(&local_datapaths); diff --git a/ovn/controller/ovn-controller.h b/ovn/controller/ovn-controller.h index 78c8b08a9..8a3e855af 100644 --- a/ovn/controller/ovn-controller.h +++ b/ovn/controller/ovn-controller.h @@ -53,9 +53,6 @@ struct ct_zone_pending_entry { * the localnet port */ struct local_datapath { struct hmap_node hmap_node; - struct hmap_node uuid_hmap_node; - struct uuid uuid; - char *logical_port; const struct sbrec_port_binding *localnet_port; }; |