netdev-linux: Fix pairing of rtnetlink register and unregister calls.

[openvswitch] / datapath / vport.h

diff --git a/datapath/vport.h b/datapath/vport.h
index f49ecc83fea3c9dc87241a848052e81b77292acf..fb3a3e37f31afdba3073be08cd277b86fa359cf3 100644 (file)
--- a/datapath/vport.h
+++ b/datapath/vport.h
@@ -44,9 +44,6 @@ int vport_del(struct vport *);
 
 struct vport *vport_locate(const char *name);
 
-int vport_attach(struct vport *);
-int vport_detach(struct vport *);
-
 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 *);
@@ -118,7 +115,7 @@ struct vport {
        struct hlist_node hash_node;
        const struct vport_ops *ops;
 
-       struct vport_percpu_stats *percpu_stats;
+       struct vport_percpu_stats __percpu *percpu_stats;
 
        spinlock_t stats_lock;
        struct vport_err_stats err_stats;
@@ -165,12 +162,7 @@ struct vport_parms {
  * 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: Destroy and free a vport using vport_free().  Prior to destruction
- * @detach will be called followed by synchronize_rcu().
- * @attach: Attach a previously created vport to a datapath.  After attachment
- * packets may be sent and received.  Prior to attachment any packets may be
- * silently discarded.  May be null if not needed.
- * @detach: Detach a vport from a datapath.  May be null if not needed.
+ * @destroy: Detach and destroy a vport.
  * @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.
  * @set_stats: Provides stats as an offset to be added to the device stats.
@@ -206,9 +198,6 @@ struct vport_ops {
        int (*modify)(struct vport *, struct odp_port *);
        int (*destroy)(struct vport *);
 
-       int (*attach)(struct vport *);
-       int (*detach)(struct vport *);
-
        int (*set_mtu)(struct vport *, int mtu);
        int (*set_addr)(struct vport *, const unsigned char *);
        int (*set_stats)(const struct vport *, struct rtnl_link_stats64 *);