From patchwork Fri Jan 10 12:25:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Numan Siddique X-Patchwork-Id: 1221043 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=hemlock.osuosl.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47vMdM2l9dz9sPn for ; Fri, 10 Jan 2020 23:25:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3734A88471; Fri, 10 Jan 2020 12:25:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zB8u30EoSjX7; Fri, 10 Jan 2020 12:25:20 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id D4DA6878B3; Fri, 10 Jan 2020 12:25:20 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C7F54C1796; Fri, 10 Jan 2020 12:25:20 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5F675C0881 for ; Fri, 10 Jan 2020 12:25:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4D854869ED for ; Fri, 10 Jan 2020 12:25:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wutm6-acr9Q3 for ; Fri, 10 Jan 2020 12:25:18 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id E47E68699E for ; Fri, 10 Jan 2020 12:25:17 +0000 (UTC) X-Originating-IP: 27.7.90.242 Received: from nummac.local (unknown [27.7.90.242]) (Authenticated sender: numans@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 318591BF20A; Fri, 10 Jan 2020 12:25:13 +0000 (UTC) From: numans@ovn.org To: dev@openvswitch.org Date: Fri, 10 Jan 2020 17:55:04 +0530 Message-Id: <20200110122504.1978276-1-numans@ovn.org> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [ovs-dev] [PATCH ovn] Fix the travis CI compilation error seen for osx job X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Numan Siddique After the commit [1], travis CI job for osx [2] is failing with the below error: ***** In file included from lib/actions.c:25: ./lib/ovn-l7.h:246:9: error: 'ND_OPT_ROUTE_INFO' macro redefined [-Werror,-Wmacro-redefined] ^ /usr/include/netinet/icmp6.h:329:9: note: previous definition is here ***** This patch renames the macro ND_OPT_ROUTE_INFO to ND_OPT_ROUTE_INFO_TYPE as this macro is used to set the Route Information Option Type. [1] - 9f7f466af("Add support for Route Info Option in RA - RFC 4191") [2] - https://travis-ci.org/ovn-org/ovn/jobs/634833728?utm_medium=notification&utm_source=github_status Fixes- 9f7f466af("Add support for Route Info Option in RA - RFC 4191") CC: Lorenzo Bianconi Signed-off-by: Numan Siddique Acked-by: Lorenzo Bianconi --- controller/pinctrl.c | 2 +- lib/ovn-l7.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/controller/pinctrl.c b/controller/pinctrl.c index c4752c673..452ca8a1c 100644 --- a/controller/pinctrl.c +++ b/controller/pinctrl.c @@ -2486,7 +2486,7 @@ packet_put_ra_route_info_opt(struct dp_packet *b, ovs_be32 lifetime, for (t1 = strtok_r(t0, "-", &r1), index = 0; t1; t1 = strtok_r(NULL, "-", &r1), index++) { - nd_rinfo.type = ND_OPT_ROUTE_INFO; + nd_rinfo.type = ND_OPT_ROUTE_INFO_TYPE; nd_rinfo.route_lifetime = lifetime; switch (index) { diff --git a/lib/ovn-l7.h b/lib/ovn-l7.h index ae6dbfdfb..375b77014 100644 --- a/lib/ovn-l7.h +++ b/lib/ovn-l7.h @@ -243,10 +243,10 @@ struct ovs_nd_dnssl { BUILD_ASSERT_DECL(ND_DNSSL_OPT_LEN == sizeof(struct ovs_nd_dnssl)); /* Route Information option RFC 4191 */ -#define ND_OPT_ROUTE_INFO 24 +#define ND_OPT_ROUTE_INFO_TYPE 24 #define ND_ROUTE_INFO_OPT_LEN 8 struct ovs_nd_route_info { - u_int8_t type; /* ND_OPT_ROUTE_INFO */ + u_int8_t type; /* ND_OPT_ROUTE_INFO_TYPE */ u_int8_t len; /* 1, 2 or 3 */ u_int8_t prefix_len; u_int8_t flags;