summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Yang <yi.y.yang@intel.com>2016-08-18 14:06:52 +0800
committerFlorin Coras <florin.coras@gmail.com>2016-08-25 13:06:26 +0000
commit4fe2291bbdf67251bb42ce742d8d481b901e1d1c (patch)
treee6be8ac84a79de5a9a5891fbb1f9878cd4c47adc
parent1557dfe8440c30319eaef6c2c13070ecc9e6eb5b (diff)
Fix vxlan-gpe next protocol value
vxlan4_gpe_rewrite and vxlan6_gpe_rewrite used the fixed value VXLAN_GPE_PROTOCOL_IP4 for next protocol regardless of vxlan-gpe port next protocol, this commit fixed it and used the value from vxlan-gpe port. Change-Id: I22ba25fbde1c0630960cbcfd196e14231fbf1af3 Signed-off-by: Yi Yang <yi.y.yang@intel.com>
-rw-r--r--vnet/vnet/vxlan-gpe/vxlan_gpe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe.c b/vnet/vnet/vxlan-gpe/vxlan_gpe.c
index f54d46c78d4..e032d568c97 100644
--- a/vnet/vnet/vxlan-gpe/vxlan_gpe.c
+++ b/vnet/vnet/vxlan-gpe/vxlan_gpe.c
@@ -162,7 +162,7 @@ static int vxlan4_gpe_rewrite (vxlan_gpe_tunnel_t * t)
/* VXLAN header. Are we having fun yet? */
h0->vxlan.flags = VXLAN_GPE_FLAGS_I | VXLAN_GPE_FLAGS_P;
h0->vxlan.ver_res = VXLAN_GPE_VERSION;
- h0->vxlan.protocol = VXLAN_GPE_PROTOCOL_IP4;
+ h0->vxlan.protocol = t->protocol;
h0->vxlan.vni_res = clib_host_to_net_u32 (t->vni<<8);
t->rewrite = rw;
@@ -200,7 +200,7 @@ static int vxlan6_gpe_rewrite (vxlan_gpe_tunnel_t * t)
/* VXLAN header. Are we having fun yet? */
h0->vxlan.flags = VXLAN_GPE_FLAGS_I | VXLAN_GPE_FLAGS_P;
h0->vxlan.ver_res = VXLAN_GPE_VERSION;
- h0->vxlan.protocol = VXLAN_GPE_PROTOCOL_IP4;
+ h0->vxlan.protocol = t->protocol;
h0->vxlan.vni_res = clib_host_to_net_u32 (t->vni<<8);
t->rewrite = rw;