Fix typos in comments.

diff --git a/include/openflow/nicira-ext.h b/include/openflow/nicira-ext.h
index 55b3548..fcdbba4 100644 (file)
--- a/include/openflow/nicira-ext.h
+++ b/include/openflow/nicira-ext.h
@@ -42,7 +42,7 @@
  * vendor-specific details, followed by at least 64 bytes of the failed
  * request.
  *
  * vendor-specific details, followed by at least 64 bytes of the failed
  * request.
  *

- * It would be better to have type-specific vendor extension, e.g. so that
+ * It would be better to have a type-specific vendor extension, e.g. so that

  * OFPET_BAD_ACTION could be used with vendor-specific code values.  But
  * OFPET_BAD_ACTION and most other standardized types already specify that
  * their 'data' values are (the start of) the OpenFlow message being replied
  * OFPET_BAD_ACTION could be used with vendor-specific code values.  But
  * OFPET_BAD_ACTION and most other standardized types already specify that
  * their 'data' values are (the start of) the OpenFlow message being replied

diff --git a/lib/ofp-util.h b/lib/ofp-util.h
index d72a50b..1c683ec 100644 (file)
--- a/lib/ofp-util.h
+++ b/lib/ofp-util.h
@@ -85,7 +85,12 @@ char *ofp_match_to_literal_string(const struct ofp_match *match);
 \f
 /* OpenFlow vendors.
  *
 \f
 /* OpenFlow vendors.
  *

- * These functions map vendor */
+ * These functions map OpenFlow 32-bit vendor IDs (as used in struct
+ * ofp_vendor_header) into 4-bit values to embed in an "int".  The 4-bit values
+ * are only used internally in Open vSwitch and never appear on the wire, so
+ * particular codes used are not important.
+ */
+

 /* Vendor error numbers currently used in Open vSwitch. */
 #define OFPUTIL_VENDORS                                     \
     /*             vendor name              vendor value */ \
 /* Vendor error numbers currently used in Open vSwitch. */
 #define OFPUTIL_VENDORS                                     \
     /*             vendor name              vendor value */ \


@@ -106,19 +111,19 @@ enum ofputil_vendor_codes {
  * error codes into a single 31-bit space using the following encoding.
  * (Bit 31 is unused and assumed 0 to avoid negative "int" values.)
  *
  * error codes into a single 31-bit space using the following encoding.
  * (Bit 31 is unused and assumed 0 to avoid negative "int" values.)
  *

- *   31                                                   0
+ *   30                                                   0

  *  +------------------------------------------------------+
  *  |                           0                          |  success
  *  +------------------------------------------------------+
  *
  *   30 29                                                0
  *  +--+---------------------------------------------------+
  *  +------------------------------------------------------+
  *  |                           0                          |  success
  *  +------------------------------------------------------+
  *
  *   30 29                                                0
  *  +--+---------------------------------------------------+

- *  |0 |                    errno value                    |  errno value
+ *  | 0|                    errno value                    |  errno value

  *  +--+---------------------------------------------------+
  *
  *   30 29   26 25            16 15                       0
  *  +--+-------+----------------+--------------------------+
  *  +--+---------------------------------------------------+
  *
  *   30 29   26 25            16 15                       0
  *  +--+-------+----------------+--------------------------+

- *  |1 |   0   |      type      |           code           |  standard OpenFlow
+ *  | 1|   0   |      type      |           code           |  standard OpenFlow

  *  +--+-------+----------------+--------------------------+  error
  *
  *   30 29   26 25            16 15                       0
  *  +--+-------+----------------+--------------------------+  error
  *
  *   30 29   26 25            16 15                       0