I applied the patch to dpdk_merge here https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_darball_ovs_commits_dpdk-5Fmerge&d=DwIGaQ&c=uilaK90D4TOVoH58JNXRgQ&r=BVhFA09CGX7JQ5Ih-uZnsw&m=A2_FCacqbp2moAo3HGFlTuxsjONUGhlN42OBcAuQQ6w&s=b6btPKhgvOFr2GOUYvktND6kaC6jc3fXI-mXfvNgXOU&e=
On 9/1/17, 2:44 AM, "Loftus, Ciara" <[email protected]> wrote: > > A couple of trivial fixes for a ternery operator placement > and pointer declaration. > > Fixes: 655856ef39b9 ("dpif-netdev: Change rxq_scheduling to use rxq > processing cycles.") > Fixes: a2ac666d5265 ("dpif-netdev: Change definitions of 'idle' & 'processing' > cycles") > Cc: [email protected] > Reported-by: Ilya Maximets <[email protected]> > Signed-off-by: Kevin Traynor <[email protected]> > --- > lib/dpif-netdev.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c > index 55d5656..1db9f10 100644 > --- a/lib/dpif-netdev.c > +++ b/lib/dpif-netdev.c > @@ -3429,6 +3429,6 @@ static int > rxq_cycle_sort(const void *a, const void *b) > { > - struct dp_netdev_rxq * qa; > - struct dp_netdev_rxq * qb; > + struct dp_netdev_rxq *qa; > + struct dp_netdev_rxq *qb; > uint64_t total_qa, total_qb; > unsigned i; > @@ -3865,7 +3865,8 @@ dpif_netdev_run(struct dpif *dpif) > port->rxqs[i].rx, > port->port_no); > - cycles_count_intermediate(non_pmd, NULL, process_packets ? > - PMD_CYCLES_PROCESSING > - : PMD_CYCLES_IDLE); > + cycles_count_intermediate(non_pmd, NULL, > + process_packets > + ? PMD_CYCLES_PROCESSING > + : PMD_CYCLES_IDLE); > } > } > -- > 1.8.3.1 LGTM. Thanks! Acked-by: Ciara Loftus <[email protected]> _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
