From patchwork Fri Nov 11 13:31:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 693684 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tFgvP5ZDDz9t2G for ; Sat, 12 Nov 2016 00:37:19 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=verge.net.au header.i=@verge.net.au header.b="CGI7+vSg"; dkim-atps=neutral Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 72CAE955; Fri, 11 Nov 2016 13:37:16 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 96A833EE for ; Fri, 11 Nov 2016 13:37:15 +0000 (UTC) X-Greylist: delayed 00:05:55 by SQLgrey-1.7.6 Received: from kirsty.vergenet.net (kirsty.vergenet.net [202.4.237.240]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id 141821A4 for ; Fri, 11 Nov 2016 13:37:14 +0000 (UTC) Received: from penelope.kanocho.kobe.vergenet.net (52D9BC73.cm-11-1c.dynamic.ziggo.nl [82.217.188.115]) by kirsty.vergenet.net (Postfix) with ESMTPSA id 00F4325B7B0; Sat, 12 Nov 2016 00:31:19 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1478871079; bh=DMhvB18JVQpx7DHgVeCLCIvM3Yg6cutb/lhoMjU+Cy8=; h=From:To:Cc:Subject:Date:From; b=CGI7+vSgPn8s/faF7u66EoJTaTg6rkHI36z/EomzS5EgfhYoONhgEwe13ocIUQ58U +H+vnQ4IqxgDtAAM4DqxOcm/hC1irKWtahUddk3rRj4KYYB0SxV0A9bkKBqIYooL2g WgTymgCTqQMe2RkhN8yyJFmRaOSjUYsZnYXwpzDk= Received: by penelope.kanocho.kobe.vergenet.net (Postfix, from userid 7100) id 8C249607A4; Fri, 11 Nov 2016 14:31:15 +0100 (CET) From: Simon Horman To: dev@openvswitch.org Date: Fri, 11 Nov 2016 14:31:07 +0100 Message-Id: <1478871067-29983-1-git-send-email-horms@verge.net.au> X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Simon Horman Subject: [ovs-dev] [PATCH] dpif-provider: Use ODPP_NONE in dp_netdev_flow_add() X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Simon Horman This appears to be the only place where ODPP_NONE is not used but could be. Signed-off-by: Simon Horman Acked-by: Joe Stringer --- lib/dpif-netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);