Message ID | 1478871067-29983-1-git-send-email-horms@verge.net.au |
---|---|
State | Accepted |
Headers | show |
On 11 November 2016 at 05:31, Simon Horman <horms@verge.net.au> wrote: > From: Simon Horman <simon.horman@netronome.com> > > This appears to be the only place where ODPP_NONE is not used but could be. > > Signed-off-by: Simon Horman <simon.horman@netronome.com> Acked-by: Joe Stringer <joe@ovn.org>
On Mon, Nov 14, 2016 at 01:27:08PM -0800, Joe Stringer wrote: > On 11 November 2016 at 05:31, Simon Horman <horms@verge.net.au> wrote: > > From: Simon Horman <simon.horman@netronome.com> > > > > This appears to be the only place where ODPP_NONE is not used but could be. > > > > Signed-off-by: Simon Horman <simon.horman@netronome.com> > > Acked-by: Joe Stringer <joe@ovn.org> Thanks, applied to master.
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 66ba2c02b3f8..eab849fc7ba1 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -2263,7 +2263,7 @@ dp_netdev_flow_add(struct dp_netdev_pmd_thread *pmd, netdev_flow_key_init_masked(&flow->cr.flow, &match->flow, &mask); /* Select dpcls for in_port. Relies on in_port to be exact match */ - ovs_assert(match->wc.masks.in_port.odp_port == ODP_PORT_C(UINT32_MAX)); + ovs_assert(match->wc.masks.in_port.odp_port == ODPP_NONE); cls = dp_netdev_pmd_find_dpcls(pmd, in_port); dpcls_insert(cls, &flow->cr, &mask);