--- openflow-2010-09-11-2.h	2015-07-23 09:54:16.092479319 -0700
+++ openflow-2010-09-30.h	2015-07-23 09:54:16.096479319 -0700
@@ -92,8 +92,8 @@
                                       NB: This can only be the destination
                                       port for packet-out messages. */
     OFPP_NORMAL     = 0xfffffffa,  /* Process with normal L2/L3 switching. */
-    OFPP_FLOOD      = 0xfffffffb,  /* All physical ports except input port and
-                                      those disabled by STP. */
+    OFPP_FLOOD      = 0xfffffffb,  /* All physical ports in VLAN, except input
+                                      port and those blocked or link down. */
     OFPP_ALL        = 0xfffffffc,  /* All physical ports except input port. */
     OFPP_CONTROLLER = 0xfffffffd,  /* Send to controller. */
     OFPP_LOCAL      = 0xfffffffe,  /* Local openflow "port". */
@@ -169,6 +169,9 @@
     /* TTL processing - applicable for IP and MPLS packets */
     OFPC_INVALID_TTL_TO_CONTROLLER = 1 << 2, /* Send packets with invalid TTL
                                                 ie. 0 or 1 to controller */
+
+    /* How to deal with blocked ports */
+    OFPC_BLOCKED_OVERRIDE = 1 << 3, /* Enable sending through blocked ports. */
 };
 
 /* Switch configuration. */
@@ -204,7 +207,8 @@
     OFPC_FLOW_STATS     = 1 << 0,  /* Flow statistics. */
     OFPC_TABLE_STATS    = 1 << 1,  /* Table statistics. */
     OFPC_PORT_STATS     = 1 << 2,  /* Port statistics. */
-    OFPC_RESERVED       = 1 << 4,  /* Reserved, must be zero. */
+    OFPC_RESERVED1      = 1 << 3,  /* Reserved, must be zero. */
+    OFPC_RESERVED2      = 1 << 4,  /* Reserved, must be zero. */
     OFPC_IP_REASM       = 1 << 5,  /* Can reassemble IP fragments. */
     OFPC_QUEUE_STATS    = 1 << 6,  /* Queue statistics. */
     OFPC_ARP_MATCH_IP   = 1 << 7   /* Match IP addresses in ARP pkts. */
@@ -226,8 +230,8 @@
  * the controller.
  */
 enum ofp_port_state {
-    OFPPS_LINK_DOWN    = 1 << 0, /* No physical link present. */
-    OFPPS_PORT_BLOCKED = 1 << 1, /* Port is blocked */
+    OFPPS_LINK_DOWN    = 1 << 0,  /* No physical link present. */
+    OFPPS_BLOCKED      = 1 << 1,  /* Port is blocked */
 };
 
 /* Features of physical ports available in a datapath. */