datapath: Streamline tunnel port lookup

[openvswitch] / datapath / tunnel.h

diff --git a/datapath/tunnel.h b/datapath/tunnel.h
index a0514957ad7fec24ac5db182c9f0a0aabc1ef9a9..b3e21fa9f3006904518515410e915452fc0de419 100644 (file)
--- a/datapath/tunnel.h
+++ b/datapath/tunnel.h
@@ -44,38 +44,47 @@
                      TNL_F_DF_INHERIT | TNL_F_DF_DEFAULT | TNL_F_PMTUD | \
                      TNL_F_HDR_CACHE | TNL_F_IPSEC)
 
+/**
+ * struct port_lookup_key - Tunnel port key, used as hash table key.
+ * @in_key: Key to match on input, 0 for wildcard.
+ * @saddr: IPv4 source address to match, 0 to accept any source address.
+ * @daddr: IPv4 destination of tunnel.
+ * @tunnel_type: Set of TNL_T_* flags that define lookup.
+ */
+struct port_lookup_key {
+       __be64 in_key;
+       __be32 saddr;
+       __be32 daddr;
+       u32    tunnel_type;
+};
+
 /**
  * struct tnl_mutable_config - modifiable configuration for a tunnel.
+ * @key: Used as key for tunnel port.  Configured via OVS_TUNNEL_ATTR_*
+ * attributes.
  * @rcu: RCU callback head for deferred destruction.
  * @seq: Sequence number for distinguishing configuration versions.
- * @tunnel_type: Set of TNL_T_* flags that define lookup.
  * @tunnel_hlen: Tunnel header length.
  * @eth_addr: Source address for packets generated by tunnel itself
  * (e.g. ICMP fragmentation needed messages).
- * @in_key: Key to match on input, 0 for wildcard.
  * @out_key: Key to use on output, 0 if this tunnel has no fixed output key.
  * @flags: TNL_F_* flags.
- * @saddr: IPv4 source address to match, 0 to accept any source address.
- * @daddr: IPv4 destination of tunnel.
  * @tos: IPv4 TOS value to use for tunnel, 0 if no fixed TOS.
  * @ttl: IPv4 TTL value to use for tunnel, 0 if no fixed TTL.
  */
 struct tnl_mutable_config {
+       struct port_lookup_key key;
        struct rcu_head rcu;
 
        unsigned seq;
 
-       u32 tunnel_type;
        unsigned tunnel_hlen;
 
        unsigned char eth_addr[ETH_ALEN];
 
        /* Configured via OVS_TUNNEL_ATTR_* attributes. */
-       __be64  in_key;
        __be64  out_key;
        u32     flags;
-       __be32  saddr;
-       __be32  daddr;
        u8      tos;
        u8      ttl;
 };