--- openflow-2011-10-24-4.h	2015-07-23 09:54:16.980479355 -0700
+++ openflow-2012-01-23.h	2015-07-23 09:54:16.984479355 -0700
@@ -1284,8 +1284,6 @@
 enum ofp_meter_prop_type {
     OFPMPT_DROP           = 1,      /* Drop packet */
     OFPMPT_DSCP_REMARK    = 2,      /* Remark DSCP in the IP header */
-    OFPMPT_WRITE_METADATA = 3,      /* Overwrite packet metadata */
-    OFPMPT_WRITE_ACTIONS  = 4,      /* Write actions in action set */
     OFPMPT_EXPERIMENTER   = 0xFFFF  /* Experimenter meter property */
 };
 
@@ -1313,26 +1311,6 @@
 };
 OFP_ASSERT(sizeof(struct ofp_meter_prop_dscp_remark) == 8);
 
-/* OFPMPT_WRITE_METADATA property - Write actions in action set */
-struct ofp_meter_prop_metadata {
-    uint16_t        type;    /* One of OFPMPT_WRITE_METADATA. */
-    uint16_t        len;     /* Length in bytes of this property. */
-    uint32_t        rate;    /* Rate for dropping packets. */
-    uint64_t        metadata;       /* Metadata value to write */
-    uint64_t        metadata_mask;  /* Metadata write bitmask */
-};
-OFP_ASSERT(sizeof(struct ofp_meter_prop_metadata) == 24);
-
-/* OFPMPT_WRITE_ACTIONS property - Write actions in action set */
-struct ofp_meter_prop_write {
-    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
-                                           from the length field. */
-};
-OFP_ASSERT(sizeof(struct ofp_meter_prop_write) == 8);
-
 /* OFPMPT_EXPERIMENTER property - Write actions in action set */
 struct ofp_meter_prop_experimenter {
     uint16_t        type;    /* One of OFPMPT_*. */
@@ -1957,7 +1935,7 @@
     uint32_t    max_meter;    /* Maximum number of meters. */
     uint32_t    types;        /* Bitmaps of OFPMPT_* values supported. */
     uint32_t    capabilities; /* Bitmaps of "ofp_meter_flags". */
-    uint32_t    actions;      /* Bitmap of OFPAT_* that are supported. */
+    uint8_t     pad[4];
 };
 OFP_ASSERT(sizeof(struct ofp_meter_features_stats) == 16);