diff options
| author |   Neale Ranns <nranns@cisco.com> | 2019-02-19 15:22:46 +0000 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-03-29 19:57:39 +0000 |
| commit | e524d45eff40c773049e03ea5063216b469bbfcc (patch) | |
| tree | 6a7cfd5f63b0aa374e72dee3158df8079140fbfc /src/vnet/ipsec-gre/node.c | |
| parent | 95c0ca42f2d02e7562775f7c1e6535a586a26186 (diff) | |
IPSEC-GRE: fixes and API update to common types.
Change-Id: Icdcbac7453baa837a9c0c4a2401dff4a6aa6cba0
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/ipsec-gre/node.c')
| -rw-r--r-- | src/vnet/ipsec-gre/node.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vnet/ipsec-gre/node.c b/src/vnet/ipsec-gre/node.c index 9e1ab206ad4..6a3aaa12e8c 100644 --- a/src/vnet/ipsec-gre/node.c +++ b/src/vnet/ipsec-gre/node.c @@ -160,7 +160,7 @@ VLIB_NODE_FN (ipsec_gre_input_node) (vlib_main_t * vm, protocol0 = clib_net_to_host_u16 (h0->protocol); protocol1 = clib_net_to_host_u16 (h1->protocol); - if (PREDICT_TRUE(protocol0 == 0x0001)) + if (PREDICT_TRUE(protocol0 == GRE_PROTOCOL_teb)) { next0 = IPSEC_GRE_INPUT_NEXT_L2_INPUT; b0->error = node->errors[IPSEC_GRE_ERROR_NONE]; @@ -170,7 +170,7 @@ VLIB_NODE_FN (ipsec_gre_input_node) (vlib_main_t * vm, b0->error = node->errors[IPSEC_GRE_ERROR_UNKNOWN_PROTOCOL]; next0 = IPSEC_GRE_INPUT_NEXT_DROP; } - if (PREDICT_TRUE(protocol1 == 0x0001)) + if (PREDICT_TRUE(protocol1 == GRE_PROTOCOL_teb)) { next1 = IPSEC_GRE_INPUT_NEXT_L2_INPUT; b1->error = node->errors[IPSEC_GRE_ERROR_NONE]; @@ -314,7 +314,7 @@ drop1: h0 = vlib_buffer_get_current (b0); protocol0 = clib_net_to_host_u16 (h0->protocol); - if (PREDICT_TRUE(protocol0 == 0x0001)) + if (PREDICT_TRUE(protocol0 == GRE_PROTOCOL_teb)) { next0 = IPSEC_GRE_INPUT_NEXT_L2_INPUT; b0->error = node->errors[IPSEC_GRE_ERROR_NONE]; @@ -332,7 +332,7 @@ drop1: next0 = verr0 ? IPSEC_GRE_INPUT_NEXT_DROP : next0; /* For L2 payload set input sw_if_index to GRE tunnel for learning */ - if (PREDICT_FALSE(next0 == IPSEC_GRE_INPUT_NEXT_L2_INPUT)) + if (PREDICT_TRUE(next0 == IPSEC_GRE_INPUT_NEXT_L2_INPUT)) { u64 key = ((u64)(tun_dst0) << 32) | (u64)(tun_src0); |