From patchwork Wed Jul 25 21:01:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 949377 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.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 41bSP13d3kz9s0n for ; Thu, 26 Jul 2018 07:03:00 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id D8BAFD60; Wed, 25 Jul 2018 21:02:57 +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 AC2DC898 for ; Wed, 25 Jul 2018 21:02:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 00438F1 for ; Wed, 25 Jul 2018 21:02:54 +0000 (UTC) X-Originating-IP: 66.170.99.1 Received: from localhost.localdomain (unknown [66.170.99.1]) (Authenticated sender: jpettit@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 6E89A1BF204; Wed, 25 Jul 2018 21:02:49 +0000 (UTC) From: Justin Pettit To: dev@openvswitch.org Date: Wed, 25 Jul 2018 14:01:31 -0700 Message-Id: <20180725210132.46739-1-jpettit@ovn.org> X-Mailer: git-send-email 2.17.1 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW 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 1/2] Revert "dpif-netdev: Use compatible function type to fix broken build." 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 Commit ab15e70eb587 ("dpctl: Expand the flow dump type filter") will be reverted, which this patch fixed, so it needs to be reverted as well. This reverts commit b10ac772218afd4f296db866f6b80258e1d1ca8a. CC: Gavi Teitz CC: Simon Horman CC: Roi Dayan CC: Aaron Conole Signed-off-by: Justin Pettit --- 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 6c3736ef517f..13a20f023554 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -3481,7 +3481,7 @@ dpif_netdev_flow_dump_cast(struct dpif_flow_dump *dump) static struct dpif_flow_dump * dpif_netdev_flow_dump_create(const struct dpif *dpif_, bool terse, - struct dpif_flow_dump_types *type OVS_UNUSED) + char *type OVS_UNUSED) { struct dpif_netdev_flow_dump *dump;