X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fvport.h;h=6c4da24fb19133ebfc1975d7bdadb963ae7f4cae;hb=9197df76b46ff6fbe1f7a522961730ffc55a860d;hp=87d561536c14d4f6e42a405d3170ebfb0cf0b68a;hpb=f7cd0081f525dd1d45fafc68397b5393196e978d;p=sliver-openvswitch.git

diff --git a/datapath/vport.h b/datapath/vport.h
index 87d561536..6c4da24fb 100644
--- a/datapath/vport.h
+++ b/datapath/vport.h
@@ -22,23 +22,19 @@ struct vport_parms;
 
 /* The following definitions are for users of the vport subsytem: */
 
-void vport_lock(void);
-void vport_unlock(void);
-
 int vport_init(void);
 void vport_exit(void);
 
 struct vport *vport_add(const struct vport_parms *);
-int vport_del(struct vport *);
+void vport_del(struct vport *);
 
 struct vport *vport_locate(const char *name);
 
-int vport_set_mtu(struct vport *, int mtu);
 int vport_set_addr(struct vport *, const unsigned char *);
 int vport_set_stats(struct vport *, struct rtnl_link_stats64 *);
 
 const char *vport_get_name(const struct vport *);
-enum odp_vport_type vport_get_type(const struct vport *);
+enum ovs_vport_type vport_get_type(const struct vport *);
 const unsigned char *vport_get_addr(const struct vport *);
 
 struct kobject *vport_get_kobj(const struct vport *);
@@ -49,7 +45,6 @@ int vport_is_running(const struct vport *);
 unsigned char vport_get_operstate(const struct vport *);
 
 int vport_get_ifindex(const struct vport *);
-int vport_get_iflink(const struct vport *);
 
 int vport_get_mtu(const struct vport *);
 
@@ -77,6 +72,7 @@ struct vport_err_stats {
 
 /**
  * struct vport - one port within a datapath
+ * @rcu: RCU callback head for deferred destruction.
  * @port_no: Index into @dp's @ports array.
  * @dp: Datapath to which this port belongs.
  * @kobj: Represents /sys/class/net/<devname>/brport.
@@ -97,6 +93,7 @@ struct vport_err_stats {
  * XAPI for Citrix XenServer.  Deprecated.
  */
 struct vport {
+	struct rcu_head rcu;
 	u16 port_no;
 	struct datapath	*dp;
 	struct kobject kobj;
@@ -124,14 +121,14 @@ struct vport {
  *
  * @name: New vport's name.
  * @type: New vport's type.
- * @options: %ODP_VPORT_ATTR_OPTIONS attribute from Netlink message, %NULL if
+ * @options: %OVS_VPORT_ATTR_OPTIONS attribute from Netlink message, %NULL if
  * none was supplied.
  * @dp: New vport's datapath.
  * @port_no: New vport's port number.
  */
 struct vport_parms {
 	const char *name;
-	enum odp_vport_type type;
+	enum ovs_vport_type type;
 	struct nlattr *options;
 
 	/* For vport_alloc(). */
@@ -142,7 +139,7 @@ struct vport_parms {
 /**
  * struct vport_ops - definition of a type of virtual port
  *
- * @type: %ODP_VPORT_TYPE_* value for this type of virtual port.
+ * @type: %OVS_VPORT_TYPE_* value for this type of virtual port.
  * @flags: Flags of type VPORT_F_* that influence how the generic vport layer
  * handles this vport.
  * @init: Called at module initialization.  If VPORT_F_REQUIRED is set then the
@@ -151,13 +148,13 @@ struct vport_parms {
  * @exit: Called at module unload.
  * @create: Create a new vport configured as specified.  On success returns
  * a new vport allocated with vport_alloc(), otherwise an ERR_PTR() value.
- * @destroy: Detach and destroy a vport.
+ * @destroy: Destroys a vport.  Must call vport_free() on the vport but not
+ * before an RCU grace period has elapsed.
  * @set_options: Modify the configuration of an existing vport.  May be %NULL
  * if modification is not supported.
  * @get_options: Appends vport-specific attributes for the configuration of an
  * existing vport to a &struct sk_buff.  May be %NULL for a vport that does not
  * have any configuration.
- * @set_mtu: Set the device's MTU.  May be null if not supported.
  * @set_addr: Set the device's MAC address.  May be null if not supported.
  * @get_name: Get the device's name.
  * @get_addr: Get the device's MAC address.
@@ -172,14 +169,12 @@ struct vport_parms {
  * @get_operstate: Get the device's operating state.
  * @get_ifindex: Get the system interface index associated with the device.
  * May be null if the device does not have an ifindex.
- * @get_iflink: Get the system interface index associated with the device that
- * will be used to send packets (may be different than ifindex for tunnels).
- * May be null if the device does not have an iflink.
- * @get_mtu: Get the device's MTU.
+ * @get_mtu: Get the device's MTU.  May be %NULL if the device does not have an
+ * MTU (as e.g. some tunnels do not).
  * @send: Send a packet on the device.  Returns the length of the packet sent.
  */
 struct vport_ops {
-	enum odp_vport_type type;
+	enum ovs_vport_type type;
 	u32 flags;
 
 	/* Called at module init and exit respectively. */
@@ -188,12 +183,11 @@ struct vport_ops {
 
 	/* Called with RTNL lock. */
 	struct vport *(*create)(const struct vport_parms *);
-	int (*destroy)(struct vport *);
+	void (*destroy)(struct vport *);
 
 	int (*set_options)(struct vport *, struct nlattr *);
 	int (*get_options)(const struct vport *, struct sk_buff *);
 
-	int (*set_mtu)(struct vport *, int mtu);
 	int (*set_addr)(struct vport *, const unsigned char *);
 
 	/* Called with rcu_read_lock or RTNL lock. */
@@ -208,7 +202,6 @@ struct vport_ops {
 	unsigned char (*get_operstate)(const struct vport *);
 
 	int (*get_ifindex)(const struct vport *);
-	int (*get_iflink)(const struct vport *);
 
 	int (*get_mtu)(const struct vport *);