ovs.db.data: Fix bugs in Atom.is_default() and Datum.is_default().

[openvswitch] / datapath / vport.c

diff --git a/datapath/vport.c b/datapath/vport.c
index 8ef96f73e1fc6ea7e77cb1881d5617e0be93ab85..487d75241fe69e5b261ea052b9e35d9b72189e6e 100644 (file)
--- a/datapath/vport.c
+++ b/datapath/vport.c
@@ -221,7 +221,7 @@ void vport_free(struct vport *vport)
  * @parms: Information about new vport.
  *
  * Creates a new vport with the specified configuration (which is dependent on
- * device type) and attaches it to a datapath.  RTNL lock must be held.
+ * device type).  RTNL lock must be held.
  */
 struct vport *vport_add(const struct vport_parms *parms)
 {
@@ -386,7 +386,7 @@ const char *vport_get_name(const struct vport *vport)
  *
  * Retrieves the type of the given device.
  */
-enum odp_vport_type vport_get_type(const struct vport *vport)
+enum ovs_vport_type vport_get_type(const struct vport *vport)
 {
        return vport->ops->type;
 }
@@ -623,7 +623,7 @@ int vport_get_mtu(const struct vport *vport)
  * @skb: sk_buff where options should be appended.
  *
  * Retrieves the configuration of the given device, appending an
- * %ODP_VPORT_ATTR_OPTIONS attribute that in turn contains nested
+ * %OVS_VPORT_ATTR_OPTIONS attribute that in turn contains nested
  * vport-specific attributes to @skb.
  *
  * Returns 0 if successful, -EMSGSIZE if @skb has insufficient room, or another
@@ -636,7 +636,7 @@ int vport_get_options(const struct vport *vport, struct sk_buff *skb)
 {
        struct nlattr *nla;
 
-       nla = nla_nest_start(skb, ODP_VPORT_ATTR_OPTIONS);
+       nla = nla_nest_start(skb, OVS_VPORT_ATTR_OPTIONS);
        if (!nla)
                return -EMSGSIZE;