Merge branch 'mainstream'

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

diff --git a/datapath/tunnel.h b/datapath/tunnel.h
index c268057..7705475 100644 (file)
--- a/datapath/tunnel.h
+++ b/datapath/tunnel.h
@@ -42,6 +42,7 @@
 #define TNL_T_PROTO_GRE                0
 #define TNL_T_PROTO_GRE64      1
 #define TNL_T_PROTO_CAPWAP     2
+#define TNL_T_PROTO_VXLAN      3
 
 /* These flags are only needed when calling tnl_find_port(). */
 #define TNL_T_KEY_EXACT                (1 << 10)
@@ -116,6 +117,7 @@ struct tnl_mutable_config {
        u32     flags;
        u8      tos;
        u8      ttl;
+       __be16  dst_port;
 
        /* Multicast configuration. */
        int     mlink;
@@ -199,6 +201,7 @@ static inline void tnl_tun_key_init(struct ovs_key_ipv4_tunnel *tun_key,
        tun_key->ipv4_tos = iph->tos;
        tun_key->ipv4_ttl = iph->ttl;
        tun_key->tun_flags = tun_flags;
+       memset(tun_key->pad, 0, sizeof(tun_key->pad));
 }
 
 static inline void tnl_get_param(const struct tnl_mutable_config *mutable,