--- openflow-2013-10-17.h	2015-07-23 09:54:17.800479389 -0700
+++ openflow-2013-10-17-2.h	2015-07-23 09:54:17.804479389 -0700
@@ -2811,6 +2811,13 @@
 };
 OFP_ASSERT(sizeof(struct ofp_meter_config) == 8);
 
+/* Meter feature flags */
+enum ofp_meter_feature_flags {
+    OFPMFF_ACTION_SET   = 1 << 0, /* Support meter action in action set. */
+    OFPMFF_ANY_POSITION = 1 << 1, /* Support any position in action list. */
+    OFPMFF_MULTI_LIST   = 1 << 2, /* Support multiple actions in action list. */
+};
+
 /* Body of reply to OFPMP_METER_FEATURES request. Meter features. */
 struct ofp_meter_features {
     uint32_t    max_meter;    /* Maximum number of meters. */
@@ -2819,8 +2826,10 @@
     uint8_t     max_bands;    /* Maximum bands per meters */
     uint8_t     max_color;    /* Maximum color value */
     uint8_t     pad[2];
+    uint32_t    features;     /* Bitmaps of "ofp_meter_feature_flags". */
+    uint8_t     pad2[4];
 };
-OFP_ASSERT(sizeof(struct ofp_meter_features) == 16);
+OFP_ASSERT(sizeof(struct ofp_meter_features) == 24);
 
 /* All ones is used to indicate all queues in a port (for stats retrieval). */
 #define OFPQ_ALL      0xffffffff