datapath: Allow GRE64 to use flow based tunneling.

[openvswitch] / datapath / vport-capwap.c

diff --git a/datapath/vport-capwap.c b/datapath/vport-capwap.c
index f26d3ff942a0562fe56a838255146effc17c289a..8a89180e5722f71e16e506c53879fe1fcffb1efc 100644 (file)
--- a/datapath/vport-capwap.c
+++ b/datapath/vport-capwap.c
@@ -155,28 +155,6 @@ static struct inet_frags frag_state = {
        .secret_interval = CAPWAP_FRAG_SECRET_INTERVAL,
 };
 
-static void get_capwap_param(const struct tnl_mutable_config *mutable,
-                       const struct ovs_key_ipv4_tunnel *tun_key,
-                       u32 *flags,  __be64 *out_key)
-{
-       if (tun_key->ipv4_dst) {
-               *flags = 0;
-
-               if (tun_key->tun_flags & OVS_TNL_F_KEY)
-                       *flags = TNL_F_OUT_KEY_ACTION;
-               if (tun_key->tun_flags & OVS_TNL_F_CSUM)
-                       *flags |= TNL_F_CSUM;
-               *out_key = tun_key->tun_id;
-       } else {
-               *flags = mutable->flags;
-               if (mutable->flags & TNL_F_OUT_KEY_ACTION)
-                       *out_key = tun_key->tun_id;
-               else
-                       *out_key = mutable->out_key;
-
-       }
-}
-
 static int capwap_hdr_len(const struct tnl_mutable_config *mutable,
                          const struct ovs_key_ipv4_tunnel *tun_key)
 {
@@ -184,7 +162,7 @@ static int capwap_hdr_len(const struct tnl_mutable_config *mutable,
        u32 flags;
        __be64 out_key;
 
-       get_capwap_param(mutable, tun_key, &flags, &out_key);
+       tnl_get_param(mutable, tun_key, &flags, &out_key);
 
        /* CAPWAP has no checksums. */
        if (flags & TNL_F_CSUM)
@@ -211,7 +189,7 @@ static struct sk_buff *capwap_build_header(const struct vport *vport,
        u32 flags;
        __be64 out_key;
 
-       get_capwap_param(mutable, tun_key, &flags, &out_key);
+       tnl_get_param(mutable, tun_key, &flags, &out_key);
 
        udph->source = htons(CAPWAP_SRC_PORT);
        udph->dest = htons(CAPWAP_DST_PORT);