From: Justin Pettit <jpettit@nicira.com>
Date: Thu, 10 Mar 2011 21:47:31 +0000 (-0800)
Subject: netdev-vport: Don't warn when a tunnel key is set.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a86254e9857f241bae149fda7b7d390a541d57c;p=openvswitch

netdev-vport: Don't warn when a tunnel key is set.

Reported-by: Reid Price <reid@nicira.com>
---

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index c6d4db89..97cc170a 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -706,8 +706,8 @@ parse_tunnel_config(const char *name, const char *type,
                     || !strcmp(node->name, "private_key")
                     || !strcmp(node->name, "use_ssl_cert"))) {
             /* Ignore options not used by the netdev. */
-        } else if (is_gre && (!strcmp(node->name, "key") &&
-                              !strcmp(node->name, "in_key") &&
+        } else if (is_gre && (!strcmp(node->name, "key") ||
+                              !strcmp(node->name, "in_key") ||
                               !strcmp(node->name, "out_key"))) {
             /* Handled separately below. */
         } else {