On Mon, Dec 11, 2017 at 08:00:07PM +0000, Stokes, Ian wrote:
> > "sparse" warns when odp_port_t is used directly in an inequality
> > comparison.  This avoids the warning.
> > 
> > CC: Kevin Traynor <[email protected]>
> > Fixes: a130f1a89bd8 ("dpif-netdev: Add port/queue tiebreaker to
> > rxq_cycle_sort.")
> > Signed-off-by: Ben Pfaff <[email protected]>
> > ---
> >  lib/dpif-netdev.c | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index
> > 43f6a7857412..68fb3925bcf1 100644
> > --- a/lib/dpif-netdev.c
> > +++ b/lib/dpif-netdev.c
> > @@ -3444,8 +3444,10 @@ compare_rxq_cycles(const void *a, const void *b)
> >          /* Cycles are the same so tiebreak on port/queue id.
> >           * Tiebreaking (as opposed to return 0) ensures consistent
> >           * sort results across multiple OS's. */
> > -        if (qa->port->port_no != qb->port->port_no) {
> > -            return (qa->port->port_no > qb->port->port_no) ? 1 : -1;
> > +        uint32_t port_qa = odp_to_u32(qa->port->port_no);
> > +        uint32_t port_qb = odp_to_u32(qb->port->port_no);
> > +        if (port_qa != port_qb) {
> > +            return port_qa > port_qb ? 1 : -1;
> >          } else {
> >              return netdev_rxq_get_queue_id(qa->rx)
> >                      - netdev_rxq_get_queue_id(qb->rx);
> 
> Thanks Ben,
> 
> Passed functional validation on this side (couldn't test for the sparse 
> warning itself unfortunately) and LGTM.
> 
> Acked-by: Ian Stokes <[email protected]>

Thanks Ian, I applied this to master.
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to