summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Gross <jesse@nicira.com>2012-09-25 13:22:08 -0700
committerJesse Gross <jesse@nicira.com>2012-09-25 14:01:51 -0700
commit991634882e5df23ea3bac0eb472b65130ec1f317 (patch)
tree23c4079b790f93e2eb6b8a6eb40b1825e68ba000
parent8249ccc4cb975fd86f944e0556b9f606af14a220 (diff)
downloadopenvswitch-991634882e5df23ea3bac0eb472b65130ec1f317.tar.gz
netdev-vport: Fix ToS/TTL mixup in unparsing.
When unparsing the kernel tunnel configuration, TTL was incorrectly converted to "tos". Although it leads to confusing configuration output, actual operation is not affected. Signed-off-by: Jesse Gross <jesse@nicira.com> Acked-by: Kyle Mestery <kmestery@cisco.com>
-rw-r--r--lib/netdev-vport.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 55209e4d1..e031c7d34 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -804,10 +804,10 @@ unparse_tunnel_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED,
}
if (flags & TNL_F_TTL_INHERIT) {
- smap_add(args, "tos", "inherit");
+ smap_add(args, "ttl", "inherit");
} else if (a[OVS_TUNNEL_ATTR_TTL]) {
int ttl = nl_attr_get_u8(a[OVS_TUNNEL_ATTR_TTL]);
- shash_add(args, "tos", xasprintf("%d", ttl));
+ shash_add(args, "ttl", xasprintf("%d", ttl));
}
if (flags & TNL_F_TOS_INHERIT) {