--- openflow-2011-10-11-6.h	2015-07-23 09:54:16.964479354 -0700
+++ openflow-2011-10-11-7.h	2015-07-23 09:54:16.968479355 -0700
@@ -1283,7 +1283,8 @@
 /* Meter property types */
 enum ofp_meter_prop_type {
     OFPMPT_DROP          = 1,      /* Drop packet */
-    OFPMPT_WRITE_ACTIONS = 2,      /* Write actions in action set */
+    OFPMPT_DSCP_REMARK   = 2,      /* Remark DSCP in the IP header */
+    OFPMPT_WRITE_ACTIONS = 3,      /* Write actions in action set */
     OFPMPT_EXPERIMENTER  = 0xFFFF  /* Experimenter meter property */
 };
 
@@ -1297,15 +1298,23 @@
 
 /* OFPMPT_DROP property - drop packets */
 struct ofp_meter_prop_drop {
-    uint16_t        type;    /* One of OFPMPT_*. */
+    uint16_t        type;    /* One of OFPMPT_DROP. */
     uint16_t        len;     /* Length in bytes of this property. */
     uint32_t        rate;    /* Rate for dropping packets. */
 };
 OFP_ASSERT(sizeof(struct ofp_meter_prop_drop) == 8);
 
+/* OFPMPT_DSCP_REMARK property - Remark DSCP in the IP header */
+struct ofp_meter_prop_dscp_remark {
+    uint16_t        type;    /* One of OFPMPT_DSCP_REMARK. */
+    uint16_t        len;     /* Length in bytes of this property. */
+    uint32_t        rate;    /* Rate for dropping packets. */
+};
+OFP_ASSERT(sizeof(struct ofp_meter_prop_dscp_remark) == 8);
+
 /* OFPMPT_WRITE_ACTIONS property - Write actions in action set */
 struct ofp_meter_prop_write {
-    uint16_t        type;    /* One of OFPMPT_*. */
+    uint16_t        type;    /* One of OFPMPT_WRITE_ACTIONS. */
     uint16_t        len;     /* Length in bytes of this property. */
     uint32_t        rate;    /* Rate for dropping packets. */
     struct ofp_action_header actions[0]; /* The action length is inferred