diff options
| author | Russell Bryant <russell@ovn.org> | 2017-02-02 02:04:07 -0500 |
|---|---|---|
| committer | Russell Bryant <russell@ovn.org> | 2017-02-03 12:30:42 -0500 |
| commit | 7f42ed63078eb33d424950f206fdcd90e69b8552 (patch) | |
| tree | cb1763079c4decdf00a10dd56fe5ff626083aaff /ovn | |
| parent | a62647280565662987769ab8470c4cda6c0f315c (diff) | |
| download | openvswitch-7f42ed63078eb33d424950f206fdcd90e69b8552.tar.gz | |
ovn: Add missing netdev_close in setup_qos.
We missed calling netdev_close in a couple of places. One was in an error
condition rarely hit. The second was just introduced and would be hit in
all cases where QoS is not in use.
Fixes: dc2dab6e6de5 ("ovn-controller: Configure interface QoS only if it would actually be used.")
Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ovn')
| -rw-r--r-- | ovn/controller/binding.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ovn/controller/binding.c b/ovn/controller/binding.c index 2d2da1648..c90cb6556 100644 --- a/ovn/controller/binding.c +++ b/ovn/controller/binding.c @@ -263,6 +263,7 @@ setup_qos(const char *egress_iface, struct hmap *queue_map) if (netdev_get_qos(netdev_phy, &qdisc_type, &qdisc_details) != 0 || qdisc_type[0] == '\0') { smap_destroy(&qdisc_details); + netdev_close(netdev_phy); /* Qos is not supported. */ return; } @@ -286,6 +287,7 @@ setup_qos(const char *egress_iface, struct hmap *queue_map) if (!strcmp(qdisc_type, OVN_QOS_TYPE)) { set_qos_type(netdev_phy, ""); } + netdev_close(netdev_phy); return; } |