From: Simon Horman <horms@verge.net.au>
Date: Wed, 25 Apr 2012 01:18:28 +0000 (+0900)
Subject: Correct OFPXMC12_{OPENFLOW_BASIC,EXPERIMENTER} definitions
X-Git-Tag: sliver-openvswitch-0.1-1~43
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7132cc8426867ab5256b2dd96206b4001a4d8a53;p=sliver-openvswitch.git

Correct OFPXMC12_{OPENFLOW_BASIC,EXPERIMENTER} definitions

This corrects errors that appear to have been included
by me in the original version.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/include/openflow/openflow-1.2.h b/include/openflow/openflow-1.2.h
index 9254cf476..f600792f6 100644
--- a/include/openflow/openflow-1.2.h
+++ b/include/openflow/openflow-1.2.h
@@ -72,8 +72,8 @@ enum ofp12_type {
 enum ofp12_oxm_class {
     OFPXMC12_NXM_0          = 0x0000, /* Backward compatibility with NXM */
     OFPXMC12_NXM_1          = 0x0001, /* Backward compatibility with NXM */
-    OFPXMC12_OPENFLOW_BASIC = 0x0000, /* Basic class for OpenFlow */
-    OFPXMC12_EXPERIMENTER   = 0x0000, /* Experimenter class */
+    OFPXMC12_OPENFLOW_BASIC = 0x8000, /* Basic class for OpenFlow */
+    OFPXMC12_EXPERIMENTER   = 0xffff, /* Experimenter class */
 };
 
 /* OXM Flow match field types for OpenFlow basic class. */