datapath: Change userspace vport interface to use Netlink attributes.

[sliver-openvswitch.git] / datapath / vport.h

diff --git a/datapath/vport.h b/datapath/vport.h
index 5e75f56..56817e8 100644 (file)
--- a/datapath/vport.h
+++ b/datapath/vport.h
@@ -23,15 +23,6 @@ struct vport_parms;
 
 /* The following definitions are for users of the vport subsytem: */
 
-int vport_user_mod(const struct odp_port __user *);
-
-int vport_user_stats_get(struct odp_vport_stats_req __user *);
-int vport_user_stats_set(struct odp_vport_stats_req __user *);
-int vport_user_ether_get(struct odp_vport_ether __user *);
-int vport_user_ether_set(struct odp_vport_ether __user *);
-int vport_user_mtu_get(struct odp_vport_mtu __user *);
-int vport_user_mtu_set(struct odp_vport_mtu __user *);
-
 void vport_lock(void);
 void vport_unlock(void);
 
@@ -39,7 +30,6 @@ int vport_init(void);
 void vport_exit(void);
 
 struct vport *vport_add(const struct vport_parms *);
-int vport_mod(struct vport *, struct odp_port *);
 int vport_del(struct vport *);
 
 struct vport *vport_locate(const char *name);
@@ -63,7 +53,9 @@ int vport_get_ifindex(const struct vport *);
 int vport_get_iflink(const struct vport *);
 
 int vport_get_mtu(const struct vport *);
-void vport_get_config(const struct vport *, void *);
+
+int vport_set_options(struct vport *, struct nlattr *options);
+int vport_get_options(const struct vport *, struct sk_buff *);
 
 int vport_send(struct vport *, struct sk_buff *);
 
@@ -133,15 +125,15 @@ struct vport {
  *
  * @name: New vport's name.
  * @type: New vport's type.
- * @config: Kernel copy of 'config' member of &struct odp_port describing
- * configuration for new port.  Exactly %VPORT_CONFIG_SIZE bytes.
+ * @options: %ODP_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;
-       const void *config;
+       struct nlattr *options;
 
        /* For vport_alloc(). */
        struct datapath *dp;
@@ -160,9 +152,12 @@ 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.
- * @modify: Modify the configuration of an existing vport.  May be null if
- * modification is not supported.
  * @destroy: Detach and destroy a vport.
+ * @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.
@@ -194,9 +189,11 @@ struct vport_ops {
 
        /* Called with RTNL lock. */
        struct vport *(*create)(const struct vport_parms *);
-       int (*modify)(struct vport *, struct odp_port *);
        int (*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 *);