ofp-errors: Merge OF1.0 "all tables full" with OF1.1+ "table full".

[openvswitch] / lib / vconn-provider.h

diff --git a/lib/vconn-provider.h b/lib/vconn-provider.h
index 43d2072e261f9b7d7ab92cbaa4a93258dcac153c..54ec2e6b04c1eab86478ed5380e277a7678ddcd8 100644 (file)
--- a/lib/vconn-provider.h
+++ b/lib/vconn-provider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 
 #include <assert.h>
 #include "vconn.h"
+#include "openflow/openflow-common.h"
 \f
 /* Active virtual connection to an OpenFlow device. */
 
@@ -32,8 +33,8 @@ struct vconn {
     struct vconn_class *class;
     int state;
     int error;
-    int min_version;
-    int version;
+    enum ofp_version min_version;
+    enum ofp_version version;
     ovs_be32 remote_ip;
     ovs_be16 remote_port;
     ovs_be32 local_ip;
@@ -63,9 +64,7 @@ struct vconn_class {
      *
      * 'suffix' is a copy of 'name' following the colon and may be modified.
      * 'dscp' is the DSCP value that the new connection should use in the IP
-     * packets it sends.  (If no DSCP value should be set in the packet, dscp
-     * will be set to DSCP_INVALID.  If no DSCP value is specified, DSCP_DEFAULT
-     * value will be applied.)
+     * packets it sends.
      *
      * Returns 0 if successful, otherwise a positive errno value.  If
      * successful, stores a pointer to the new connection in '*vconnp'.
@@ -155,9 +154,7 @@ struct pvconn_class {
      *
      * 'suffix' is a copy of 'name' following the colon and may be modified.
      * 'dscp' is the DSCP value that the new connection should use in the IP
-     * packets it sends.  (If no DSCP value should be set in the packet, dscp
-     * will be set to DSCP_INVALID.  If no DSCP value is specified, DSCP_DEFAULT
-     * value will be applied.)
+     * packets it sends.
      *
      * Returns 0 if successful, otherwise a positive errno value.  If
      * successful, stores a pointer to the new connection in '*pvconnp'.