--- openflow-2012-01-24.h	2015-07-23 09:54:17.000479356 -0700
+++ openflow-2012-01-24-2.h	2015-07-23 09:54:17.004479356 -0700
@@ -1291,11 +1291,11 @@
 
 /* Meter property types */
 enum ofp_meter_prop_type {
-    OFPMPT_DROP            = 1,      /* Drop packet */
-    OFPMPT_DSCP_REMARK     = 2,      /* Remark DSCP in the IP header */
-    OFPMPT_COLOR_INCREASE  = 3,      /* Increase metering color by amount */
-    OFPMPT_COLOR_RAISE_TO  = 4,      /* Raise metering color to level */
-    OFPMPT_EXPERIMENTER    = 0xFFFF  /* Experimenter meter property */
+    OFPMPT_DROP            = 1,      /* Drop packet. */
+    OFPMPT_DSCP_REMARK     = 2,      /* Remark DSCP in the IP header. */
+    OFPMPT_COLOR_INCREASE  = 3,      /* Increase metering color by amount. */
+    OFPMPT_COLOR_RAISE_TO  = 4,      /* Raise metering color to level. */
+    OFPMPT_EXPERIMENTER    = 0xFFFF  /* Experimenter meter property. */
 };
 
 /* Common header for all rate properties */
@@ -1303,48 +1303,48 @@
     uint16_t        type;    /* One of OFPMPT_*. */
     uint16_t        len;     /* Length in bytes of this property. */
     uint32_t        rate;    /* Rate for this property. */
-    uint32_t        burst_size;   /* Size of bursts */
+    uint32_t        burst_size; /* Size of bursts. */
 };
 OFP_ASSERT(sizeof(struct ofp_meter_prop_header) == 12);
 
 /* OFPMPT_DROP property - drop packets */
 struct ofp_meter_prop_drop {
-    uint16_t        type;    /* One of OFPMPT_DROP. */
+    uint16_t        type;    /* OFPMPT_DROP. */
     uint16_t        len;     /* Length in bytes of this property. */
     uint32_t        rate;    /* Rate for dropping packets. */
-    uint32_t        burst_size;   /* Size of bursts */
+    uint32_t        burst_size; /* Size of bursts. */
     uint8_t         pad[4];
 };
 OFP_ASSERT(sizeof(struct ofp_meter_prop_drop) == 16);
 
 /* 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        type;    /* OFPMPT_DSCP_REMARK. */
     uint16_t        len;     /* Length in bytes of this property. */
     uint32_t        rate;    /* Rate for dropping packets. */
-    uint32_t        burst_size;   /* Size of bursts */
-    uint8_t         prec_level;   /* Number of precendence level to remove */
+    uint32_t        burst_size; /* Size of bursts. */
+    uint8_t         prec_level; /* Number of precendence level to substract. */
     uint8_t         pad[3];
 };
 OFP_ASSERT(sizeof(struct ofp_meter_prop_dscp_remark) == 16);
 
 /* OFPMPT_COLOR_INCREASE property - Increase metering color by amount */
 struct ofp_meter_prop_color_increase {
-    uint16_t        type;    /* One of OFPMPT_COLOR_INCREASE. */
+    uint16_t        type;    /* OFPMPT_COLOR_INCREASE. */
     uint16_t        len;     /* Length in bytes of this property. */
     uint32_t        rate;    /* Rate for dropping packets. */
-    uint32_t        burst_size;   /* Size of bursts */
-    uint32_t        amount;       /* Amount to add to metering color */
+    uint32_t        burst_size; /* Size of bursts. */
+    uint32_t        amount;     /* Amount to add to metering color. */
 };
 OFP_ASSERT(sizeof(struct ofp_meter_prop_color_increase) == 16);
 
 /* OFPMPT_COLOR_RAISE_TO property - Raise metering color to level */
 struct ofp_meter_prop_color_raise_to {
-    uint16_t        type;    /* One of OFPMPT_COLOR_RAISE_TO. */
+    uint16_t        type;    /* OFPMPT_COLOR_RAISE_TO. */
     uint16_t        len;     /* Length in bytes of this property. */
     uint32_t        rate;    /* Rate for dropping packets. */
-    uint32_t        burst_size;   /* Size of bursts */
-    uint32_t        level;        /* Minimum color level for packet */
+    uint32_t        burst_size; /* Size of bursts. */
+    uint32_t        level;      /* Minimum color level for packet. */
 };
 OFP_ASSERT(sizeof(struct ofp_meter_prop_color_raise_to) == 16);
 
@@ -1353,10 +1353,10 @@
     uint16_t        type;    /* One of OFPMPT_*. */
     uint16_t        len;     /* Length in bytes of this property. */
     uint32_t        rate;    /* Rate for dropping packets. */
-    uint32_t        burst_size;     /* Size of bursts */
-    uint32_t        experimenter;   /* Experimenter ID which takes the same
-                                       form as in struct
-                                       ofp_experimenter_header. */
+    uint32_t        burst_size;   /* Size of bursts. */
+    uint32_t        experimenter; /* Experimenter ID which takes the same
+                                     form as in struct
+                                     ofp_experimenter_header. */
 };
 OFP_ASSERT(sizeof(struct ofp_meter_prop_experimenter) == 16);
 
@@ -1369,10 +1369,10 @@
 
 /* Meter configuration flags */
 enum ofp_meter_flags {
-    OFPMF_KBPS    = 1 << 0,     /* Rate value in kb/s (kilo-bit per second) */
-    OFPMF_PKTPS   = 1 << 1,     /* Rate value in packet/sec */
-    OFPMF_BURST   = 1 << 2,     /* Do burst size */
-    OFPMF_STATS   = 1 << 3,     /* Collect statistics */
+    OFPMF_KBPS    = 1 << 0,     /* Rate value in kb/s (kilo-bit per second). */
+    OFPMF_PKTPS   = 1 << 1,     /* Rate value in packet/sec. */
+    OFPMF_BURST   = 1 << 2,     /* Do burst size. */
+    OFPMF_STATS   = 1 << 3,     /* Collect statistics. */
 };
 
 /* Meter configuration. OFPT_METER_MOD. */