--- openflow-2014-10-01-2.h	2015-07-23 09:54:17.816479389 -0700
+++ openflow-2014-10-01-3.h	2015-07-23 09:54:17.824479390 -0700
@@ -3163,57 +3163,57 @@
 };
 
 struct ofp_bundle_features_prop_header {
-	uint16_t type;          /* One of OFPTMPBF_*. */
-	uint16_t length;        /* Length in bytes of this property. */
+    uint16_t type;          /* One of OFPTMPBF_*. */
+    uint16_t length;        /* Length in bytes of this property. */
 };
 OFP_ASSERT(sizeof(struct ofp_bundle_features_prop_header) == 4);
 
 /* Body of OFPMP_BUNDLE_FEATURES request. */
 struct ofp_bundle_features_request {
-	uint32_t feature_request_flags;  /* Bitmap of "ofp_bundle_feature_flags". */
-	uint8_t pad[4];
+    uint32_t feature_request_flags;  /* Bitmap of "ofp_bundle_feature_flags". */
+    uint8_t pad[4];
 
-	/* Bundle features property list - 0 or more. */
-	struct ofp_bundle_features_prop_header properties[0];
+    /* Bundle features property list - 0 or more. */
+    struct ofp_bundle_features_prop_header properties[0];
 };
 OFP_ASSERT(sizeof(struct ofp_bundle_features_request) == 8);
 
 /* Bundle features property types. */
 enum ofp_bundle_features_prop_type {
-	OFPTMPBF_TIME_CAPABILITY = 0x1, /* Time feature property. */
-	OFPTMPBF_EXPERIMENTER = 0xFFFF, /* Experimenter property. */
+    OFPTMPBF_TIME_CAPABILITY = 0x1, /* Time feature property. */
+    OFPTMPBF_EXPERIMENTER = 0xFFFF, /* Experimenter property. */
 };
 
 struct ofp_bundle_features_prop_time {
-	uint16_t type;                    /* OFPTMPBF_TIME_CAPABILITY. */
-	uint16_t length;                  /* Length in bytes of this property. */
-	uint8_t pad[4];
-	struct ofp_time sched_accuracy;   /* The scheduling accuracy, i.e., how accurately the switch can
-                                           * perform a scheduled commit. This field is used only in bundle
-                                           * features replies, and is ignored in bundle features requests. */
-	struct ofp_time sched_max_future; /* The maximal difference between the
-                                           * scheduling time and the current time.*/
-	struct ofp_time sched_max_past;   /* If the scheduling time occurs in the past, defines the maximal
-                                           * difference between the current time and the scheduling time.*/
-	struct ofp_time timestamp;        /* Indicates the time during the transmission of this message.*/
+    uint16_t type;                    /* OFPTMPBF_TIME_CAPABILITY. */
+    uint16_t length;                  /* Length in bytes of this property. */
+    uint8_t pad[4];
+    struct ofp_time sched_accuracy;   /* The scheduling accuracy, i.e., how accurately the switch can
+                                       * perform a scheduled commit. This field is used only in bundle
+                                       * features replies, and is ignored in bundle features requests. */
+    struct ofp_time sched_max_future; /* The maximal difference between the
+                                       * scheduling time and the current time.*/
+    struct ofp_time sched_max_past;   /* If the scheduling time occurs in the past, defines the maximal
+                                       * difference between the current time and the scheduling time.*/
+    struct ofp_time timestamp;        /* Indicates the time during the transmission of this message.*/
 };
 OFP_ASSERT(sizeof(struct ofp_bundle_features_prop_time) == 72);
 
 enum ofp_bundle_feature_flags {
-	OFPBF_TIMESTAMP = 1 << 0,       /* When enabled, the current request 
-                                         * includes a timestamp, using the time property. */
-	OFPBF_TIME_SET_SCHED = 1 << 1,  /* When enabled, the current request includes 
-                                         * the sched_max_future and sched_max_past 
-                                         * parameters, using the time property. */
+    OFPBF_TIMESTAMP = 1 << 0,       /* When enabled, the current request 
+                                     * includes a timestamp, using the time property. */
+    OFPBF_TIME_SET_SCHED = 1 << 1,  /* When enabled, the current request includes 
+                                     * the sched_max_future and sched_max_past 
+                                     * parameters, using the time property. */
 };
 
 /* Body of reply to OFPMP_BUNDLE_FEATURES request. */
 struct ofp_bundle_features {
-	uint16_t capabilities; /* Bitmap of "ofp_bundle_flags". */
-	uint8_t pad[6];
+    uint16_t capabilities; /* Bitmap of "ofp_bundle_flags". */
+    uint8_t pad[6];
 
-	/* Bundle features property list - 0 or more. */
-	struct ofp_bundle_features_prop_header properties[0];
+    /* Bundle features property list - 0 or more. */
+    struct ofp_bundle_features_prop_header properties[0];
 };
 OFP_ASSERT(sizeof(struct ofp_bundle_features) == 8);
 
@@ -3442,8 +3442,8 @@
 
 /* Bundle property types. */
 enum ofp_bundle_prop_type {
-    OFPBPT_EXPERIMENTER           = 0xFFFF, /* Experimenter property. */
     OFPBPT_TIME                   = 1,      /* Time property. */ 
+    OFPBPT_EXPERIMENTER           = 0xFFFF, /* Experimenter property. */
 };
 
 /* Common header for all Bundle Properties */
@@ -3470,19 +3470,19 @@
 OFP_ASSERT(sizeof(struct ofp_bundle_prop_experimenter) == 12);
 
 /* Time Format. */
-struct ofp_time{
-	uint64_t seconds;
-	uint32_t nanoseconds;
-	uint8_t  pad[4];
+struct ofp_time {
+    uint64_t seconds;
+    uint32_t nanoseconds;
+    uint8_t  pad[4];
 };
 OFP_ASSERT(sizeof(struct ofp_time)==16);
 
 /* Bundle time property. */
-struct ofp_bundle_prop_time{
-	uint16_t type;       /* OFPBPT_TIME */
-	uint16_t length;     /* Length in bytes of this property (24). */
-	uint8_t  pad[4];
-	struct ofp_time scheduled_time;
+    struct ofp_bundle_prop_time {
+    uint16_t type;       /* OFPBPT_TIME */
+    uint16_t length;     /* Length in bytes of this property (24). */
+    uint8_t  pad[4];
+    struct ofp_time scheduled_time;
 };
 OFP_ASSERT(sizeof(struct ofp_bundle_prop_time)==24);