diff options
author | Ben Warren <ben@skyportsystems.com> | 2016-03-03 10:20:42 -0800 |
---|---|---|
committer | Ben Pfaff <blp@ovn.org> | 2016-03-19 09:37:48 -0700 |
commit | b211014d26bd467f1e46db3dacefa9249819148c (patch) | |
tree | db54ff645e23e10beabaecd904b8a3f9aab2ed3f /lib | |
parent | 27de40d031a1a93412be6aba30d901c27f308604 (diff) | |
download | openvswitch-b211014d26bd467f1e46db3dacefa9249819148c.tar.gz |
Move lib/geneve.h to include/openvswitch directory
Signed-off-by: Ben Warren <ben@skyportsystems.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/automake.mk | 1 | ||||
-rw-r--r-- | lib/geneve.h | 63 | ||||
-rw-r--r-- | lib/packets.h | 2 | ||||
-rw-r--r-- | lib/tun-metadata.h | 2 |
4 files changed, 2 insertions, 66 deletions
diff --git a/lib/automake.mk b/lib/automake.mk index ea92a23b9..cbb0f2119 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -86,7 +86,6 @@ lib_libopenvswitch_la_SOURCES = \ lib/fatal-signal.h \ lib/flow.c \ lib/flow.h \ - lib/geneve.h \ lib/guarded-list.c \ lib/guarded-list.h \ lib/hash.c \ diff --git a/lib/geneve.h b/lib/geneve.h deleted file mode 100644 index db841291a..000000000 --- a/lib/geneve.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2015 Nicira, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef GENEVE_H -#define GENEVE_H 1 - -#include "openvswitch/types.h" - -#define TLV_MAX_OPT_SIZE 124 -#define TLV_TOT_OPT_SIZE 252 - -#define GENEVE_CRIT_OPT_TYPE (1 << 7) - -struct geneve_opt { - ovs_be16 opt_class; - uint8_t type; -#ifdef WORDS_BIGENDIAN - uint8_t r1:1; - uint8_t r2:1; - uint8_t r3:1; - uint8_t length:5; -#else - uint8_t length:5; - uint8_t r3:1; - uint8_t r2:1; - uint8_t r1:1; -#endif - /* Option data */ -}; - -struct genevehdr { -#ifdef WORDS_BIGENDIAN - uint8_t ver:2; - uint8_t opt_len:6; - uint8_t oam:1; - uint8_t critical:1; - uint8_t rsvd1:6; -#else - uint8_t opt_len:6; - uint8_t ver:2; - uint8_t rsvd1:6; - uint8_t critical:1; - uint8_t oam:1; -#endif - ovs_be16 proto_type; - ovs_16aligned_be32 vni; - struct geneve_opt options[]; -}; - -#endif /* geneve.h */ diff --git a/lib/packets.h b/lib/packets.h index 3cba39f32..a8ea24be8 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -23,7 +23,7 @@ #include <stdint.h> #include <string.h> #include "compiler.h" -#include "geneve.h" +#include "openvswitch/geneve.h" #include "openvswitch/types.h" #include "odp-netlink.h" #include "random.h" diff --git a/lib/tun-metadata.h b/lib/tun-metadata.h index 4b0993e68..14471deaf 100644 --- a/lib/tun-metadata.h +++ b/lib/tun-metadata.h @@ -20,10 +20,10 @@ #include <stdint.h> #include "dynamic-string.h" -#include "geneve.h" #include "netlink.h" #include "ofpbuf.h" #include "openflow/openflow.h" +#include "openvswitch/geneve.h" struct flow_tnl; struct match; |