summaryrefslogtreecommitdiff
path: root/datapath-windows
diff options
context:
space:
mode:
authorWilliam Tu <u9012063@gmail.com>2022-05-29 19:54:45 -0700
committerAlin-Gabriel Serdean <aserdean@ovn.org>2022-06-22 00:53:11 +0300
commitbca41028307a18d5cf10b41fdfb464ff3d9b6c81 (patch)
treeeb3afb21a89bda36293046ee668238a0285780e9 /datapath-windows
parent88e3ae5d6f7370acbf1d9d60c1a06e4132e4e532 (diff)
downloadopenvswitch-bca41028307a18d5cf10b41fdfb464ff3d9b6c81.tar.gz
datapath-windows: Fix GRE/VxLAN/STT Tunnel RX.
GRE/Vxlan/STT tunnel RX is broken due to incorrecly checking the 'tunKey->dst.si_family != AF_INET', which is actually set later after parsing the GRE header. Removing such chunk makes tunnel works. Fixes: edb2335861d6 ("datapath-windows: Add IPv6 Geneve tunnel support in Windows") Cc: Alin-Gabriel Serdean <aserdean@ovn.org> Signed-off-by: William Tu <u9012063@gmail.com> Signed-off-by: Alin-Gabriel Serdean <aserdean@ovn.org>
Diffstat (limited to 'datapath-windows')
-rw-r--r--datapath-windows/ovsext/Gre.c5
-rw-r--r--datapath-windows/ovsext/Stt.c6
-rw-r--r--datapath-windows/ovsext/Vxlan.c5
3 files changed, 0 insertions, 16 deletions
diff --git a/datapath-windows/ovsext/Gre.c b/datapath-windows/ovsext/Gre.c
index d87864029..54725dd17 100644
--- a/datapath-windows/ovsext/Gre.c
+++ b/datapath-windows/ovsext/Gre.c
@@ -332,11 +332,6 @@ OvsDecapGre(POVS_SWITCH_CONTEXT switchContext,
*newNbl = NULL;
- if (tunKey->dst.si_family != AF_INET) {
- /*V6 tunnel support will be supported later*/
- return NDIS_STATUS_FAILURE;
- }
-
status = OvsExtractLayers(curNbl, &layers);
if (status != NDIS_STATUS_SUCCESS) {
return status;
diff --git a/datapath-windows/ovsext/Stt.c b/datapath-windows/ovsext/Stt.c
index ebdebb690..09d317934 100644
--- a/datapath-windows/ovsext/Stt.c
+++ b/datapath-windows/ovsext/Stt.c
@@ -931,12 +931,6 @@ OvsDecapStt(POVS_SWITCH_CONTEXT switchContext,
UINT32 advanceCnt, hdrLen;
OVS_PACKET_HDR_INFO layers = { 0 };
-
- if (tunKey->dst.si_family != AF_INET) {
- /*V6 tunnel support will be supported later*/
- return NDIS_STATUS_FAILURE;
- }
-
status = OvsExtractLayers(curNbl, &layers);
if (status != NDIS_STATUS_SUCCESS) {
return status;
diff --git a/datapath-windows/ovsext/Vxlan.c b/datapath-windows/ovsext/Vxlan.c
index d2c7a4a46..b268e7de2 100644
--- a/datapath-windows/ovsext/Vxlan.c
+++ b/datapath-windows/ovsext/Vxlan.c
@@ -412,11 +412,6 @@ OvsDecapVxlan(POVS_SWITCH_CONTEXT switchContext,
NDIS_STATUS status;
OVS_PACKET_HDR_INFO layers = { 0 };
- if (tunKey->dst.si_family != AF_INET) {
- /*V6 tunnel support will be supported later*/
- return NDIS_STATUS_FAILURE;
- }
-
status = OvsExtractLayers(curNbl, &layers);
if (status != NDIS_STATUS_SUCCESS) {
return status;