| Message ID | 20181002230300.19452-2-blp@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,1/2] netdev: Properly clear 'details' when iterating in NETDEV_QOS_FOR_EACH. | expand |
On Tue, Oct 02, 2018 at 04:03:00PM -0700, Ben Pfaff wrote: > This reverts commit 6b4d0211e84a ("bridge: Fix ovs-appctl qos/show > repeated queue information"), which is no longer necessary now that > commit 65f3c34c7417 ("netdev: Properly clear 'details' when iterating > in NETDEV_QOS_FOR_EACH.") has been applied. The former commit fixed > a symptom of the root cause fixed by the latter. > > Signed-off-by: Ben Pfaff <blp@ovn.org> > --- LGTM Acked-by: Flavio Leitner <fbl@sysclose.org>
On 3 Oct 2018, at 1:03, Ben Pfaff wrote: > This reverts commit 6b4d0211e84a ("bridge: Fix ovs-appctl qos/show > repeated queue information"), which is no longer necessary now that > commit 65f3c34c7417 ("netdev: Properly clear 'details' when iterating > in NETDEV_QOS_FOR_EACH.") has been applied. The former commit fixed > a symptom of the root cause fixed by the latter. > > Signed-off-by: Ben Pfaff <blp@ovn.org> Looks good! Acked-by: Eelco Chaudron <echaudro@redhat.com> > --- > vswitchd/bridge.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c > index 875bb607c603..706a07cc6fb9 100644 > --- a/vswitchd/bridge.c > +++ b/vswitchd/bridge.c > @@ -3235,7 +3235,6 @@ qos_unixctl_show(struct unixctl_conn *conn, int > argc OVS_UNUSED, > smap_init(&details); > NETDEV_QUEUE_FOR_EACH (&queue_id, &details, &dump, > iface->netdev) { > qos_unixctl_show_queue(queue_id, &details, iface, > &ds); > - smap_clear(&details); > } > smap_destroy(&details); > > -- > 2.16.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Thanks Flavio and Eelco. I applied these patches to master and backported as far as they would go.
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 875bb607c603..706a07cc6fb9 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -3235,7 +3235,6 @@ qos_unixctl_show(struct unixctl_conn *conn, int argc OVS_UNUSED, smap_init(&details); NETDEV_QUEUE_FOR_EACH (&queue_id, &details, &dump, iface->netdev) { qos_unixctl_show_queue(queue_id, &details, iface, &ds); - smap_clear(&details); } smap_destroy(&details);
This reverts commit 6b4d0211e84a ("bridge: Fix ovs-appctl qos/show repeated queue information"), which is no longer necessary now that commit 65f3c34c7417 ("netdev: Properly clear 'details' when iterating in NETDEV_QOS_FOR_EACH.") has been applied. The former commit fixed a symptom of the root cause fixed by the latter. Signed-off-by: Ben Pfaff <blp@ovn.org> --- vswitchd/bridge.c | 1 - 1 file changed, 1 deletion(-)