From: Pravin B Shelar <pshelar@nicira.com>
Date: Tue, 9 Oct 2012 23:08:39 +0000 (-0700)
Subject: datapath: Fix GRE tunnel without any key.
X-Git-Tag: sliver-openvswitch-1.9.90-1~3^2~67
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=685c931cff7c2f212dd82118ad1d97ccfc3a708d

datapath: Fix GRE tunnel without any key.

Commit 2de795adb96 (datapath: 64-bit GRE support) introduced a bug
for tunnels with no key. Following patch fixes it by setting tunnel
type to GRE type.

Bugs: 13511
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Kyle Mestery <kmestery@cisco.com>
---

diff --git a/datapath/vport-gre.c b/datapath/vport-gre.c
index 6f406bc9c..4000c749b 100644
--- a/datapath/vport-gre.c
+++ b/datapath/vport-gre.c
@@ -202,8 +202,11 @@ static int parse_header(struct iphdr *iph, __be16 *flags, __be64 *tun_id,
 			*tunnel_type = TNL_T_PROTO_GRE;
 		}
 		*tun_id = key_to_tunnel_id(gre_key, seq);
-	} else
+	} else {
 		*tun_id = 0;
+		/* Ignore GRE seq if there is no key present. */
+		*tunnel_type = TNL_T_PROTO_GRE;
+	}
 
 	if (greh->flags & GRE_SEQ)
 		hdr_len += GRE_HEADER_SECTION;