Merge branch 'mainstream'

[sliver-openvswitch.git] / include / openflow / openflow-1.3.h

diff --git a/include/openflow/openflow-1.3.h b/include/openflow/openflow-1.3.h
index b7b877c..767e048 100644 (file)
--- a/include/openflow/openflow-1.3.h
+++ b/include/openflow/openflow-1.3.h
@@ -105,7 +105,7 @@ OFP_ASSERT(sizeof(struct ofp13_instruction_meter) == 8);
 
 enum ofp13_action_type {
     OFPAT13_PUSH_PBB = 26,     /* Push a new PBB service tag (I-TAG) */
-    OFPAT13_PPO_PBB  = 27      /* Pop the outer PBB service tag (I-TAG) */
+    OFPAT13_POP_PBB  = 27      /* Pop the outer PBB service tag (I-TAG) */
 };
 
 /* enum ofp_config_flags value OFPC_INVALID_TTL_TO_CONTROLLER
@@ -116,8 +116,7 @@ enum ofp13_table_config {
     OFPTC13_DEPRECATED_MASK = 3  /* Deprecated bits */
 };
 
-/* OpenFlow 1.3 specific flags
- * (struct ofp12_flow_mod, member flags). */
+/* OpenFlow 1.3 specific flags for flow_mod messages. */
 enum ofp13_flow_mod_flags {
     OFPFF13_NO_PKT_COUNTS = 1 << 3, /* Don't keep track of packet count. */
     OFPFF13_NO_BYT_COUNTS = 1 << 4  /* Don't keep track of byte count. */
@@ -402,7 +401,7 @@ struct ofp13_meter_stats {
     ovs_be32  duration_sec;      /* Time meter has been alive in seconds. */
     ovs_be32  duration_nsec;     /* Time meter has been alive in nanoseconds
                                     beyond duration_sec. */
-    /* struct ofp13_meter_band_stats band_stats[0];  The band_stats length is
+    struct ofp13_meter_band_stats band_stats[0];  /* The band_stats length is
                                              inferred from the length field. */
 };
 OFP_ASSERT(sizeof(struct ofp13_meter_stats) == 40);