From patchwork Tue Apr 30 23:27:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 1093507 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 44tyQF2g6cz9s5c for ; Wed, 1 May 2019 09:28:37 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 05D3E1E57; Tue, 30 Apr 2019 23:28:02 +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 61F871C5A for ; Tue, 30 Apr 2019 23:27:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id C98EC5F4 for ; Tue, 30 Apr 2019 23:27:37 +0000 (UTC) X-Originating-IP: 66.170.99.95 Received: from sigill.benpfaff.org (unknown [66.170.99.95]) (Authenticated sender: blp@ovn.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 6D08E1C0002; Tue, 30 Apr 2019 23:27:35 +0000 (UTC) From: Ben Pfaff To: dev@openvswitch.org Date: Tue, 30 Apr 2019 16:27:20 -0700 Message-Id: <20190430232728.31093-2-blp@ovn.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190430232728.31093-1-blp@ovn.org> References: <20190430232728.31093-1-blp@ovn.org> MIME-Version: 1.0 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: Ben Pfaff Subject: [ovs-dev] [PATCH 02/10] ofp-actions: Make decap action format output match parsed input. 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: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org The action expects 'type' as a parameter name so it should use 'type' when it formats actions too. Signed-off-by: Ben Pfaff --- lib/ofp-actions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index 182277da85cb..c2cef769e839 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -4625,7 +4625,7 @@ format_DECAP(const struct ofpact_decap *a, { ds_put_format(fp->s, "%sdecap(%s", colors.paren, colors.end); if (a->new_pkt_type != htonl(PT_USE_NEXT_PROTO)) { - ds_put_format(fp->s, "packet_type(ns=%"PRIu16",id=%#"PRIx16")", + ds_put_format(fp->s, "packet_type(ns=%"PRIu16",type=%#"PRIx16")", pt_ns(a->new_pkt_type), pt_ns_type(a->new_pkt_type)); }