gre: Restructure tunneling.

[sliver-openvswitch.git] / datapath / flow.c

diff --git a/datapath/flow.c b/datapath/flow.c
index 3a7bc9b..38b9502 100644 (file)
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -1146,7 +1146,7 @@ int ipv4_tun_from_nlattr(const struct nlattr *attr,
        struct nlattr *a;
        int rem;
        bool ttl = false;
-       u16 tun_flags = 0;
+       __be16 tun_flags = 0;
 
        nla_for_each_nested(a, attr, rem) {
                int type = nla_type(a);
@@ -1168,7 +1168,7 @@ int ipv4_tun_from_nlattr(const struct nlattr *attr,
                case OVS_TUNNEL_KEY_ATTR_ID:
                        SW_FLOW_KEY_PUT(match, tun_key.tun_id,
                                        nla_get_be64(a), is_mask);
-                       tun_flags |= OVS_TNL_F_KEY;
+                       tun_flags |= TUNNEL_KEY;
                        break;
                case OVS_TUNNEL_KEY_ATTR_IPV4_SRC:
                        SW_FLOW_KEY_PUT(match, tun_key.ipv4_src,
@@ -1188,10 +1188,10 @@ int ipv4_tun_from_nlattr(const struct nlattr *attr,
                        ttl = true;
                        break;
                case OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT:
-                       tun_flags |= OVS_TNL_F_DONT_FRAGMENT;
+                       tun_flags |= TUNNEL_DONT_FRAGMENT;
                        break;
                case OVS_TUNNEL_KEY_ATTR_CSUM:
-                       tun_flags |= OVS_TNL_F_CSUM;
+                       tun_flags |= TUNNEL_CSUM;
                        break;
                default:
                        return -EINVAL;
@@ -1222,7 +1222,7 @@ int ipv4_tun_to_nlattr(struct sk_buff *skb,
        if (!nla)
                return -EMSGSIZE;
 
-       if (tun_key->tun_flags & OVS_TNL_F_KEY &&
+       if (tun_key->tun_flags & TUNNEL_KEY &&
            nla_put_be64(skb, OVS_TUNNEL_KEY_ATTR_ID, output->tun_id))
                return -EMSGSIZE;
        if (tun_key->ipv4_src &&
@@ -1235,10 +1235,10 @@ int ipv4_tun_to_nlattr(struct sk_buff *skb,
                return -EMSGSIZE;
        if (nla_put_u8(skb, OVS_TUNNEL_KEY_ATTR_TTL, output->ipv4_ttl))
                return -EMSGSIZE;
-       if ((tun_key->tun_flags & OVS_TNL_F_DONT_FRAGMENT) &&
+       if ((tun_key->tun_flags & TUNNEL_DONT_FRAGMENT) &&
                nla_put_flag(skb, OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT))
                return -EMSGSIZE;
-       if ((tun_key->tun_flags & OVS_TNL_F_CSUM) &&
+       if ((tun_key->tun_flags & TUNNEL_CSUM) &&
                nla_put_flag(skb, OVS_TUNNEL_KEY_ATTR_CSUM))
                return -EMSGSIZE;