openvswitch: Remove Linux bridge compatibility.

[sliver-openvswitch.git] / datapath / vport-gre.c

diff --git a/datapath/vport-gre.c b/datapath/vport-gre.c
index 7f8bc9a..8ce8a35 100644 (file)
--- a/datapath/vport-gre.c
+++ b/datapath/vport-gre.c
@@ -32,7 +32,6 @@
 #include "datapath.h"
 #include "tunnel.h"
 #include "vport.h"
-#include "vport-generic.h"
 
 /*
  * The GRE header is composed of a series of sections: a base and then a variable
@@ -353,15 +352,16 @@ static bool check_checksum(struct sk_buff *skb)
 }
 
 static u32 gre_flags_to_tunnel_flags(const struct tnl_mutable_config *mutable,
-                                    __be16 gre_flags)
+                                    __be16 gre_flags, __be64 *key)
 {
        u32 tunnel_flags = 0;
 
        if (gre_flags & GRE_KEY) {
-               if (mutable->key.daddr && (mutable->flags & TNL_F_IN_KEY_MATCH))
-                       tunnel_flags = OVS_TNL_F_KEY;
-               else if (!mutable->key.daddr)
+               if (mutable->flags & TNL_F_IN_KEY_MATCH ||
+                   !mutable->key.daddr)
                        tunnel_flags = OVS_TNL_F_KEY;
+               else
+                       *key = 0;
        }
 
        if (gre_flags & GRE_CSUM)
@@ -378,7 +378,8 @@ static int gre_rcv(struct sk_buff *skb)
        int hdr_len;
        struct iphdr *iph;
        struct ovs_key_ipv4_tunnel tun_key;
-       __be16 flags;
+       __be16 gre_flags;
+       u32 tnl_flags;
        __be64 key;
        u32 tunnel_type;
 
@@ -387,7 +388,7 @@ static int gre_rcv(struct sk_buff *skb)
        if (unlikely(!check_checksum(skb)))
                goto error;
 
-       hdr_len = parse_header(ip_hdr(skb), &flags, &key, &tunnel_type);
+       hdr_len = parse_header(ip_hdr(skb), &gre_flags, &key, &tunnel_type);
        if (unlikely(hdr_len < 0))
                goto error;
 
@@ -402,7 +403,8 @@ static int gre_rcv(struct sk_buff *skb)
                goto error;
        }
 
-       tnl_tun_key_init(&tun_key, iph, key, gre_flags_to_tunnel_flags(mutable, flags));
+       tnl_flags = gre_flags_to_tunnel_flags(mutable, gre_flags, &key);
+       tnl_tun_key_init(&tun_key, iph, key, tnl_flags);
        OVS_CB(skb)->tun_key = &tun_key;
 
        __skb_pull(skb, hdr_len);
@@ -492,9 +494,6 @@ const struct vport_ops ovs_gre_ft_vport_ops = {
        .get_addr       = ovs_tnl_get_addr,
        .get_options    = ovs_tnl_get_options,
        .set_options    = ovs_tnl_set_options,
-       .get_dev_flags  = ovs_vport_gen_get_dev_flags,
-       .is_running     = ovs_vport_gen_is_running,
-       .get_operstate  = ovs_vport_gen_get_operstate,
        .send           = ovs_tnl_send,
 };
 
@@ -510,9 +509,6 @@ const struct vport_ops ovs_gre_vport_ops = {
        .get_addr       = ovs_tnl_get_addr,
        .get_options    = ovs_tnl_get_options,
        .set_options    = ovs_tnl_set_options,
-       .get_dev_flags  = ovs_vport_gen_get_dev_flags,
-       .is_running     = ovs_vport_gen_is_running,
-       .get_operstate  = ovs_vport_gen_get_operstate,
        .send           = ovs_tnl_send,
 };
 
@@ -528,8 +524,5 @@ const struct vport_ops ovs_gre64_vport_ops = {
        .get_addr       = ovs_tnl_get_addr,
        .get_options    = ovs_tnl_get_options,
        .set_options    = ovs_tnl_set_options,
-       .get_dev_flags  = ovs_vport_gen_get_dev_flags,
-       .is_running     = ovs_vport_gen_is_running,
-       .get_operstate  = ovs_vport_gen_get_operstate,
        .send           = ovs_tnl_send,
 };