summaryrefslogtreecommitdiffstats
path: root/vnet
diff options
context:
space:
mode:
authorHongjun Ni <hongjun.ni@intel.com>2016-07-22 18:19:19 +0800
committerHongjun Ni <hongjun.ni@intel.com>2016-07-22 19:51:30 +0800
commit11bfc2f7f3896b7a539f662f1385516e653b3926 (patch)
treefe2413ad1b64ca669558aa5687025a725bd67b94 /vnet
parent80d7f4b2bc543774b2c9232afca119d4a860c11e (diff)
HONEYCOMB-83: Add Gre Feature
PatchSet 3: use clib_memcpy for copy. PatchSet 2: use clib_memcpy() to copy IP address. PatchSet 1: Support IPv6 interface for GRE API. Change-Id: I80ee4b61df15da7fd851b682a97d5d49f89568b7 Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
Diffstat (limited to 'vnet')
-rw-r--r--vnet/vnet/gre/gre.h2
-rw-r--r--vnet/vnet/gre/interface.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/vnet/vnet/gre/gre.h b/vnet/vnet/gre/gre.h
index d44d8d9d9c6..d875be990c6 100644
--- a/vnet/vnet/gre/gre.h
+++ b/vnet/vnet/gre/gre.h
@@ -126,7 +126,7 @@ typedef struct {
u8 is_add;
ip4_address_t src, dst;
- u32 outer_table_id;
+ u32 outer_fib_id;
} vnet_gre_add_del_tunnel_args_t;
int vnet_gre_add_del_tunnel
diff --git a/vnet/vnet/gre/interface.c b/vnet/vnet/gre/interface.c
index a57367401d5..03591e1ff41 100644
--- a/vnet/vnet/gre/interface.c
+++ b/vnet/vnet/gre/interface.c
@@ -56,7 +56,7 @@ int vnet_gre_add_del_tunnel
if (p)
return VNET_API_ERROR_INVALID_VALUE;
- p = hash_get (im->fib_index_by_table_id, a->outer_table_id);
+ p = hash_get (im->fib_index_by_table_id, a->outer_fib_id);
if (! p)
return VNET_API_ERROR_NO_SUCH_FIB;
@@ -188,7 +188,7 @@ create_gre_tunnel_command_fn (vlib_main_t * vm,
memset (a, 0, sizeof (*a));
a->is_add = is_add;
- a->outer_table_id = outer_fib_id;
+ a->outer_fib_id = outer_fib_id;
clib_memcpy(&a->src, &src, sizeof(src));
clib_memcpy(&a->dst, &dst, sizeof(dst));