datapath: Remove checks for preinitialized flow.

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

diff --git a/datapath/vport.h b/datapath/vport.h
index 3cea3a0..074c6ee 100644 (file)
--- a/datapath/vport.h
+++ b/datapath/vport.h
@@ -26,17 +26,15 @@
 #include <linux/spinlock.h>
 #include <linux/u64_stats_sync.h>
 
-#include "vport-capwap.h"
-
 struct vport;
 struct vport_parms;
 
+/* The following definitions are for users of the vport subsytem: */
 struct vport_net {
-       struct capwap_net capwap;
+       struct vport __rcu *gre_vport;
+       struct vport __rcu *gre64_vport;
 };
 
-/* The following definitions are for users of the vport subsytem: */
-
 int ovs_vport_init(void);
 void ovs_vport_exit(void);
 
@@ -45,7 +43,6 @@ void ovs_vport_del(struct vport *);
 
 struct vport *ovs_vport_locate(struct net *net, const char *name);
 
-int ovs_vport_set_addr(struct vport *, const unsigned char *);
 void ovs_vport_set_stats(struct vport *, struct ovs_vport_stats *);
 void ovs_vport_get_stats(struct vport *, struct ovs_vport_stats *);
 
@@ -75,7 +72,6 @@ struct vport_err_stats {
  * struct vport - one port within a datapath
  * @rcu: RCU callback head for deferred destruction.
  * @dp: Datapath to which this port belongs.
- * @kobj: Represents /sys/class/net/<devname>/brport.
  * @linkname: The name of the link from /sys/class/net/<datapath>/brif to this
  * &struct vport.  (We keep this around so that we can delete it if the
  * device gets renamed.)  Set to the null string when no link exists.
@@ -94,7 +90,6 @@ struct vport_err_stats {
 struct vport {
        struct rcu_head rcu;
        struct datapath *dp;
-       struct kobject kobj;
        char linkname[IFNAMSIZ];
        u32 upcall_portid;
        u16 port_no;
@@ -111,8 +106,7 @@ struct vport {
 };
 
 #define VPORT_F_REQUIRED       (1 << 0) /* If init fails, module loading fails. */
-#define VPORT_F_FLOW           (1 << 1) /* Sets OVS_CB(skb)->flow. */
-#define VPORT_F_TUN_ID         (1 << 2) /* Sets OVS_CB(skb)->tun_id. */
+#define VPORT_F_TUN_ID         (1 << 1) /* Sets OVS_CB(skb)->tun_id. */
 
 /**
  * struct vport_parms - parameters for creating a new vport
@@ -154,19 +148,10 @@ struct vport_parms {
  * @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_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.
  * @get_config: Get the device's configuration.
- * @get_kobj: Get the kobj associated with the device (may return null).
- * @get_dev_flags: Get the device's flags.
- * @is_running: Checks whether the device is running.
- * @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_mtu: Get the device's MTU.  May be %NULL if the device does not have an
- * MTU (as e.g. some tunnels do not).  Must be implemented if @get_ifindex is
- * implemented.
  * @send: Send a packet on the device.  Returns the length of the packet sent.
  */
 struct vport_ops {
@@ -184,22 +169,10 @@ struct vport_ops {
        int (*set_options)(struct vport *, struct nlattr *);
        int (*get_options)(const struct vport *, struct sk_buff *);
 
-       int (*set_addr)(struct vport *, const unsigned char *);
-
        /* Called with rcu_read_lock or RTNL lock. */
        const char *(*get_name)(const struct vport *);
-       const unsigned char *(*get_addr)(const struct vport *);
        void (*get_config)(const struct vport *, void *);
-       struct kobject *(*get_kobj)(const struct vport *);
-
-       unsigned (*get_dev_flags)(const struct vport *);
-       int (*is_running)(const struct vport *);
-       unsigned char (*get_operstate)(const struct vport *);
-
        int (*get_ifindex)(const struct vport *);
-
-       int (*get_mtu)(const struct vport *);
-
        int (*send)(struct vport *, struct sk_buff *);
 };
 
@@ -252,11 +225,9 @@ void ovs_vport_record_error(struct vport *, enum vport_err_type err_type);
  * add yours to the list at the top of vport.c. */
 extern const struct vport_ops ovs_netdev_vport_ops;
 extern const struct vport_ops ovs_internal_vport_ops;
-extern const struct vport_ops ovs_patch_vport_ops;
 extern const struct vport_ops ovs_gre_vport_ops;
-extern const struct vport_ops ovs_gre_ft_vport_ops;
 extern const struct vport_ops ovs_gre64_vport_ops;
-extern const struct vport_ops ovs_capwap_vport_ops;
 extern const struct vport_ops ovs_vxlan_vport_ops;
+extern const struct vport_ops ovs_lisp_vport_ops;
 
 #endif /* vport.h */