Define IQ macro for SSL man page fragment

[openvswitch] / include / openflow / nicira-ext.h

diff --git a/include/openflow/nicira-ext.h b/include/openflow/nicira-ext.h
index 8434a30af06d801ef93915132322f3edd4f5cfff..7232d570723c8c54ab23ce95e931e82af67d56bc 100644 (file)
--- a/include/openflow/nicira-ext.h
+++ b/include/openflow/nicira-ext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,27 +37,14 @@ enum nicira_type {
      * pairs in the form "key=value\n". */
     NXT_STATUS_REPLY,
 
-    /* Configure an action.  Most actions do not require configuration
-     * beyond that supplied in the actual action call. */
-    NXT_ACT_SET_CONFIG,
-
-    /* Get configuration of action. */
-    NXT_ACT_GET_CONFIG,
-
     /* No longer used. */
+    NXT_ACT_SET_CONFIG__OBSOLETE,
+    NXT_ACT_GET_CONFIG__OBSOLETE,
     NXT_COMMAND_REQUEST__OBSOLETE,
-
-    /* No longer used. */
     NXT_COMMAND_REPLY__OBSOLETE,
-
-    /* No longer used. */
     NXT_FLOW_END_CONFIG__OBSOLETE,
-
-    /* No longer used. */
     NXT_FLOW_END__OBSOLETE,
-
-    /* Management protocol.  See "openflow-mgmt.h". */
-    NXT_MGMT,
+    NXT_MGMT__OBSOLETE,
 };
 
 struct nicira_header {
@@ -65,7 +52,7 @@ struct nicira_header {
     uint32_t vendor;            /* NX_VENDOR_ID. */
     uint32_t subtype;           /* One of NXT_* above. */
 };
-OFP_ASSERT(sizeof(struct nicira_header) == sizeof(struct ofp_vendor_header) + 4);
+OFP_ASSERT(sizeof(struct nicira_header) == 16);
 
 
 enum nx_action_subtype {