datapath: remove actions.h

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

diff --git a/datapath/tunnel.h b/datapath/tunnel.h
index b3e21fa..fff6ca6 100644 (file)
--- a/datapath/tunnel.h
+++ b/datapath/tunnel.h
@@ -33,11 +33,12 @@
 /* These flags are only needed when calling tnl_find_port(). */
 #define TNL_T_KEY_EXACT                (1 << 10)
 #define TNL_T_KEY_MATCH                (1 << 11)
-#define TNL_T_KEY_EITHER       (TNL_T_KEY_EXACT | TNL_T_KEY_MATCH)
 
 /* Private flags not exposed to userspace in this form. */
-#define TNL_F_IN_KEY_MATCH      (1 << 16) /* Store the key in tun_id to match in flow table. */
-#define TNL_F_OUT_KEY_ACTION   (1 << 17) /* Get the key from a SET_TUNNEL action. */
+#define TNL_F_IN_KEY_MATCH     (1 << 16) /* Store the key in tun_id to
+                                          * match in flow table. */
+#define TNL_F_OUT_KEY_ACTION   (1 << 17) /* Get the key from a SET_TUNNEL
+                                          * action. */
 
 /* All public tunnel flags. */
 #define TNL_F_PUBLIC (TNL_F_CSUM | TNL_F_TOS_INHERIT | TNL_F_TTL_INHERIT | \
@@ -58,6 +59,9 @@ struct port_lookup_key {
        u32    tunnel_type;
 };
 
+#define PORT_KEY_LEN   (offsetof(struct port_lookup_key, tunnel_type) + \
+                        FIELD_SIZEOF(struct port_lookup_key, tunnel_type))
+
 /**
  * struct tnl_mutable_config - modifiable configuration for a tunnel.
  * @key: Used as key for tunnel port.  Configured via OVS_TUNNEL_ATTR_*
@@ -87,6 +91,9 @@ struct tnl_mutable_config {
        u32     flags;
        u8      tos;
        u8      ttl;
+
+       /* Multicast configuration. */
+       int     mlink;
 };
 
 struct tnl_ops {
@@ -146,8 +153,10 @@ struct tnl_cache {
        struct rcu_head rcu;
 
        int len;                /* Length of data to be memcpy'd from cache. */
+       int hh_len;             /* Hardware hdr length, cached from hh_cache. */
 
-       /* Sequence number of mutable->seq from which this cache was generated. */
+       /* Sequence number of mutable->seq from which this cache was
+        * generated. */
        unsigned mutable_seq;
 
 #ifdef HAVE_HH_SEQ
@@ -210,7 +219,7 @@ struct tnl_vport {
        atomic_t frag_id;
 
        spinlock_t cache_lock;
-       struct tnl_cache __rcu *cache;          /* Protected by RCU/cache_lock. */
+       struct tnl_cache __rcu *cache;  /* Protected by RCU/cache_lock. */
 
 #ifdef NEED_CACHE_TIMEOUT
        /*