ovs-ofctl: Clarify in_port in manpage.

[openvswitch] / datapath / tunnel.h

diff --git a/datapath/tunnel.h b/datapath/tunnel.h
index 784cda1a93d8f61d26e8ab55b2fb8999f3a09a16..a0514957ad7fec24ac5db182c9f0a0aabc1ef9a9 100644 (file)
--- a/datapath/tunnel.h
+++ b/datapath/tunnel.h
@@ -13,7 +13,6 @@
 
 #include "flow.h"
 #include "openvswitch/tunnel.h"
-#include "table.h"
 #include "vport.h"
 
 /*
@@ -71,7 +70,7 @@ struct tnl_mutable_config {
 
        unsigned char eth_addr[ETH_ALEN];
 
-       /* Configured via ODP_TUNNEL_ATTR_* attributes. */
+       /* Configured via OVS_TUNNEL_ATTR_* attributes. */
        __be64  in_key;
        __be64  out_key;
        u32     flags;
@@ -187,7 +186,7 @@ struct tnl_cache {
 
 struct tnl_vport {
        struct rcu_head rcu;
-       struct tbl_node tbl_node;
+       struct hlist_node hash_node;
 
        char name[IFNAMSIZ];
        const struct tnl_ops *tnl_ops;
@@ -217,7 +216,7 @@ struct tnl_vport {
 
 struct vport *tnl_create(const struct vport_parms *, const struct vport_ops *,
                         const struct tnl_ops *);
-int tnl_destroy(struct vport *);
+void tnl_destroy(struct vport *);
 
 int tnl_set_options(struct vport *, struct nlattr *);
 int tnl_get_options(const struct vport *, struct sk_buff *);
@@ -236,6 +235,8 @@ bool tnl_frag_needed(struct vport *vport,
                     struct sk_buff *skb, unsigned int mtu, __be64 flow_key);
 void tnl_free_linked_skbs(struct sk_buff *skb);
 
+int tnl_init(void);
+void tnl_exit(void);
 static inline struct tnl_vport *tnl_vport_priv(const struct vport *vport)
 {
        return vport_priv(vport);