From patchwork Thu Jan 14 22:31:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Gross X-Patchwork-Id: 567771 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 1DD15140B93 for ; Fri, 15 Jan 2016 09:31:52 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 1482810C1D; Thu, 14 Jan 2016 14:31:51 -0800 (PST) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id AE5FB10C1B for ; Thu, 14 Jan 2016 14:31:49 -0800 (PST) Received: from bar4.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id D9157161B9B for ; Thu, 14 Jan 2016 15:31:48 -0700 (MST) X-ASG-Debug-ID: 1452810708-03dc213f27034f0001-byXFYA Received: from mx3-pf2.cudamail.com ([192.168.14.1]) by bar4.cudamail.com with ESMTP id 68OCWKnDtLlWgo3v (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 14 Jan 2016 15:31:48 -0700 (MST) X-Barracuda-Envelope-From: jesse@kernel.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.1 Received: from unknown (HELO mail.kernel.org) (198.145.29.136) by mx3-pf2.cudamail.com with SMTP; 14 Jan 2016 22:31:48 -0000 Received-SPF: none (mx3-pf2.cudamail.com: domain at kernel.org does not designate permitted sender hosts) X-Barracuda-Apparent-Source-IP: 198.145.29.136 X-Barracuda-RBL-IP: 198.145.29.136 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3751A204D9 for ; Thu, 14 Jan 2016 22:31:47 +0000 (UTC) Received: from localhost.localdomain (c-71-202-123-143.hsd1.ca.comcast.net [71.202.123.143]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5AADD204A9 for ; Thu, 14 Jan 2016 22:31:46 +0000 (UTC) X-CudaMail-Envelope-Sender: jesse@kernel.org From: Jesse Gross To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V2-113055651 X-CudaMail-DTE: 011416 X-CudaMail-Originating-IP: 198.145.29.136 Date: Thu, 14 Jan 2016 14:31:14 -0800 X-ASG-Orig-Subj: [##CM-V2-113055651##][PATCH] ovn: Use assigned Geneve class. Message-Id: <1452810674-32788-1-git-send-email-jesse@kernel.org> X-Mailer: git-send-email 2.5.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP X-Barracuda-Connect: UNKNOWN[192.168.14.1] X-Barracuda-Start-Time: 1452810708 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] [PATCH] ovn: Use assigned Geneve class. 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" The most recent version of the Geneve draft included an option class assignment for OVN: https://tools.ietf.org/html/draft-ietf-nvo3-geneve-01 As a result, we can stop using the experimental class and switch to the allocated one (0x0102). Signed-off-by: Jesse Gross Acked-by: Ben Pfaff --- I plan on applying this to branch-2.5 as well to avoid having a shipping version of OVN using an unassigned class. --- ovn/controller/physical.h | 4 +--- ovn/ovn-architecture.7.xml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ovn/controller/physical.h b/ovn/controller/physical.h index a06f759..2906937 100644 --- a/ovn/controller/physical.h +++ b/ovn/controller/physical.h @@ -35,10 +35,8 @@ struct simap; /* OVN Geneve option information. * - * These are placeholders until OVS is assigned a Geneve option class. - * * Keep these in sync with the documentation in ovn-architecture(7). */ -#define OVN_GENEVE_CLASS 0xffff /* Geneve experimental class. */ +#define OVN_GENEVE_CLASS 0x0102 /* Assigned Geneve class for OVN. */ #define OVN_GENEVE_TYPE 0 #define OVN_GENEVE_LEN 4 diff --git a/ovn/ovn-architecture.7.xml b/ovn/ovn-architecture.7.xml index 318555b..c437b0d 100644 --- a/ovn/ovn-architecture.7.xml +++ b/ovn/ovn-architecture.7.xml @@ -1017,7 +1017,7 @@ OVN transmits the logical ingress and logical egress ports in a TLV with - class 0xffff, type 0, and a 32-bit value encoded as follows, from MSB to + class 0x0102, type 0, and a 32-bit value encoded as follows, from MSB to LSB: