From patchwork Tue Jul 12 06:56:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 647314 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3rpdJn5YMqz9s9N for ; Tue, 12 Jul 2016 20:20:41 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id B1A8310872; Tue, 12 Jul 2016 03:20:26 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 2EF3F1075F for ; Tue, 12 Jul 2016 03:20:24 -0700 (PDT) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id A83F5420625 for ; Tue, 12 Jul 2016 04:20:23 -0600 (MDT) X-ASG-Debug-ID: 1468318823-09eadd72160c2a0001-byXFYA Received: from mx3-pf3.cudamail.com ([192.168.14.3]) by bar5.cudamail.com with ESMTP id 9Mh0GEJhooOxzzoL (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 12 Jul 2016 04:20:23 -0600 (MDT) X-Barracuda-Envelope-From: jpettit@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.3 Received: from unknown (HELO slow1-d.mail.gandi.net) (217.70.178.86) by mx3-pf3.cudamail.com with SMTP; 12 Jul 2016 10:20:22 -0000 Received-SPF: pass (mx3-pf3.cudamail.com: SPF record at ovn.org designates 217.70.178.86 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.178.86 X-Barracuda-RBL-IP: 217.70.178.86 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by slow1-d.mail.gandi.net (Postfix) with ESMTP id 182894B6611 for ; Tue, 12 Jul 2016 12:17:12 +0200 (CEST) X-Originating-IP: 98.234.50.139 Received: from localhost.localdomain (unknown [98.234.50.139]) (Authenticated sender: jpettit@ovn.org) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id ABDBBC5B3D for ; Tue, 12 Jul 2016 12:17:11 +0200 (CEST) X-CudaMail-Envelope-Sender: jpettit@ovn.org From: Justin Pettit To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V3-711003455 X-CudaMail-DTE: 071216 X-CudaMail-Originating-IP: 217.70.178.86 Date: Mon, 11 Jul 2016 23:56:48 -0700 X-ASG-Orig-Subj: [##CM-V3-711003455##][ovn-ipv6 18/26] packets: Rename "rco_flags" to "rso_flags". Message-Id: <1468306616-125783-19-git-send-email-jpettit@ovn.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468306616-125783-1-git-send-email-jpettit@ovn.org> References: <1468306616-125783-1-git-send-email-jpettit@ovn.org> X-Barracuda-Connect: UNKNOWN[192.168.14.3] X-Barracuda-Start-Time: 1468318823 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [ovn-ipv6 18/26] packets: Rename "rco_flags" to "rso_flags". X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" I presume the flags are supposed to map to neighbor discovery advertisement "Router", "Solicited", and "Override" flags, which would be "rso" instead of "rco". Signed-off-by: Justin Pettit Acked-by: Ben Pfaff --- lib/packets.c | 6 +++--- lib/packets.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/packets.c b/lib/packets.c index 9b34961..1437cb6 100644 --- a/lib/packets.c +++ b/lib/packets.c @@ -1378,7 +1378,7 @@ compose_nd_sol(struct dp_packet *b, const struct eth_addr eth_src, ns->icmph.icmp6_type = ND_NEIGHBOR_SOLICIT; ns->icmph.icmp6_code = 0; - put_16aligned_be32(&ns->rco_flags, htonl(0)); + put_16aligned_be32(&ns->rso_flags, htonl(0)); nd_opt = &ns->options[0]; nd_opt->nd_opt_type = ND_OPT_SOURCE_LINKADDR; @@ -1396,7 +1396,7 @@ void compose_nd_adv(struct dp_packet *b, const struct eth_addr eth_src, const struct eth_addr eth_dst, const struct in6_addr *ipv6_src, const struct in6_addr *ipv6_dst, - ovs_be32 rco_flags) + ovs_be32 rso_flags) { struct ovs_nd_msg *na; struct ovs_nd_opt *nd_opt; @@ -1410,7 +1410,7 @@ compose_nd_adv(struct dp_packet *b, na->icmph.icmp6_type = ND_NEIGHBOR_ADVERT; na->icmph.icmp6_code = 0; - put_16aligned_be32(&na->rco_flags, rco_flags); + put_16aligned_be32(&na->rso_flags, rso_flags); nd_opt = &na->options[0]; nd_opt->nd_opt_type = ND_OPT_TARGET_LINKADDR; diff --git a/lib/packets.h b/lib/packets.h index 2043175..28b742d 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -834,7 +834,7 @@ BUILD_ASSERT_DECL(ND_OPT_LEN == sizeof(struct ovs_nd_opt)); #define ND_MSG_LEN 24 struct ovs_nd_msg { struct icmp6_header icmph; - ovs_16aligned_be32 rco_flags; + ovs_16aligned_be32 rso_flags; union ovs_16aligned_in6_addr target; struct ovs_nd_opt options[0]; }; @@ -1077,7 +1077,7 @@ void compose_nd_adv(struct dp_packet *, const struct eth_addr eth_src, const struct eth_addr eth_dst, const struct in6_addr *ipv6_src, const struct in6_addr *ipv6_dst, - ovs_be32 rco_flags); + ovs_be32 rso_flags); uint32_t packet_csum_pseudoheader(const struct ip_header *); void IP_ECN_set_ce(struct dp_packet *pkt, bool is_ipv6);