projects
/
cascardo
/
ovs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
85dcedf
)
netdev-vport: Don't warn when a tunnel key is set.
author
Justin Pettit
<jpettit@nicira.com>
Thu, 10 Mar 2011 21:47:31 +0000
(13:47 -0800)
committer
Justin Pettit
<jpettit@nicira.com>
Thu, 10 Mar 2011 22:02:23 +0000
(14:02 -0800)
Reported-by: Reid Price <reid@nicira.com>
lib/netdev-vport.c
patch
|
blob
|
history
diff --git
a/lib/netdev-vport.c
b/lib/netdev-vport.c
index
c6d4db8
..
97cc170
100644
(file)
--- 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 {