--- openflow-2012-03-12.h	2015-07-23 09:54:17.032479357 -0700
+++ openflow-2012-03-12-2.h	2015-07-23 09:54:17.036479357 -0700
@@ -454,10 +454,9 @@
     OFPXMT_OFP_MPLS_BOS       = 36, /* MPLS BoS bit. */
     OFPXMT_OFB_PBB_ISID       = 37, /* PBB I-SID. */
     OFPXMT_OFB_TUNNEL_ID      = 38, /* Logical Port Metadata. */
-    OFPXMT_OFB_METER_COLOR    = 39, /* Metering color. */
 };
 
-#define OFPXMT_OFB_ALL    ((UINT64_C(1) << 40) - 1)
+#define OFPXMT_OFB_ALL    ((UINT64_C(1) << 39) - 1)
 
 /* OpenFlow port on which the packet was received.
  * May be a physical port, a logical port, or the reserved port OFPP_LOCAL
@@ -854,16 +853,6 @@
 #define OXM_OF_TUNNEL_ID    OXM_HEADER  (0x8000, OFPXMT_OFB_TUNNEL_ID, 8)
 #define OXM_OF_TUNNEL_ID_W  OXM_HEADER_W(0x8000, OFPXMT_OFB_TUNNEL_ID, 8)
 
-/* The metering color (packet metadata).
- *
- * Prereqs: None.
- *
- * Format: 8-bit integer in network byte order.
- * Default value is 0.
- *
- * Masking: Not maskable. */
-#define OXM_OF_METER_COLOR  OXM_HEADER  (0x8000, OFPXMT_OFB_METER_COLOR, 1)
-
 /* Header for OXM experimenter match fields. */
 struct ofp_oxm_experimenter_header {
     uint32_t oxm_header;        /* oxm_class = OFPXMC_EXPERIMENTER */
@@ -1018,7 +1007,6 @@
     OFPIT_CLEAR_ACTIONS = 5,    /* Clears all actions from the datapath
                                    action set */
     OFPIT_METER = 6,            /* Apply meter (rate limiter) */
-    OFPIT_WRITE_METER_COLOR = 7, /* Setup the metering color field */
 
     OFPIT_EXPERIMENTER = 0xFFFF  /* Experimenter instruction */
 };
@@ -1069,15 +1057,6 @@
 };
 OFP_ASSERT(sizeof(struct ofp_instruction_meter) == 8);
 
-/* Instruction structure for OFPIT_WRITE_METER_COLOR */
-struct ofp_instruction_write_meter_color {
-    uint16_t type;                /* OFPIT_WRITE_METER_COLOR */
-    uint16_t len;                 /* Length of this struct in bytes. */
-    uint8_t meter_color;          /* Meter color. */
-    uint8_t pad[3];               /* Align to 64-bits */
-};
-OFP_ASSERT(sizeof(struct ofp_instruction_write_meter_color) == 8);
-
 /* Instruction structure for experimental instructions */
 struct ofp_instruction_experimenter {
     uint16_t type;		/* OFPIT_EXPERIMENTER */
@@ -1304,8 +1283,6 @@
 enum ofp_meter_band_type {
     OFPMBT_DROP            = 1,      /* Drop packet. */
     OFPMBT_DSCP_REMARK     = 2,      /* Remark DSCP in the IP header. */
-    OFPMBT_COLOR_INCREASE  = 3,      /* Increase metering color by amount. */
-    OFPMBT_COLOR_RAISE_TO  = 4,      /* Raise metering color to level. */
     OFPMBT_EXPERIMENTER    = 0xFFFF  /* Experimenter meter band. */
 };
 
@@ -1339,26 +1316,6 @@
 };
 OFP_ASSERT(sizeof(struct ofp_meter_band_dscp_remark) == 16);
 
-/* OFPMBT_COLOR_INCREASE band - Increase metering color by amount */
-struct ofp_meter_band_color_increase {
-    uint16_t        type;    /* OFPMBT_COLOR_INCREASE. */
-    uint16_t        len;     /* Length in bytes of this band. */
-    uint32_t        rate;    /* Rate for coloring packets. */
-    uint32_t        burst_size; /* Size of bursts. */
-    uint32_t        amount;     /* Amount to add to metering color. */
-};
-OFP_ASSERT(sizeof(struct ofp_meter_band_color_increase) == 16);
-
-/* OFPMBT_COLOR_RAISE_TO band - Raise metering color to level */
-struct ofp_meter_band_color_raise_to {
-    uint16_t        type;    /* OFPMBT_COLOR_RAISE_TO. */
-    uint16_t        len;     /* Length in bytes of this band. */
-    uint32_t        rate;    /* Rate for coloring packets. */
-    uint32_t        burst_size; /* Size of bursts. */
-    uint32_t        level;      /* Minimum color level for packet. */
-};
-OFP_ASSERT(sizeof(struct ofp_meter_band_color_raise_to) == 16);
-
 /* OFPMBT_EXPERIMENTER band - Write actions in action set */
 struct ofp_meter_band_experimenter {
     uint16_t        type;    /* One of OFPMBT_*. */