From: Jesse Gross <jesse@kernel.org>
Date: Thu, 14 Jan 2016 22:25:17 +0000 (-0800)
Subject: ovn: Use assigned Geneve class.
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=57d445324205b5a95b88cc4993ac0a7d9abd5186;p=cascardo%2Fovs.git

ovn: Use assigned Geneve class.

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 <jesse@kernel.org>
Acked-by: Ben Pfaff <blp@ovn.org>
---

diff --git a/ovn/controller/physical.h b/ovn/controller/physical.h
index a06f759a5..290693758 100644
--- a/ovn/controller/physical.h
+++ b/ovn/controller/physical.h
@@ -34,11 +34,9 @@ struct ovsrec_bridge;
 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 318555b62..c437b0dbe 100644
--- a/ovn/ovn-architecture.7.xml
+++ b/ovn/ovn-architecture.7.xml
@@ -1017,7 +1017,7 @@
 
     <!-- Keep the following in sync with ovn/controller/physical.h. -->
     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:
   </p>