From: Jesse Gross <jesse@nicira.com>
Date: Tue, 25 Sep 2012 20:22:08 +0000 (-0700)
Subject: netdev-vport: Fix ToS/TTL mixup in unparsing.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62827e6abef5844d61f2f57d9a643c0ffb092210;p=openvswitch

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>
---

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index db5c3db8..d5c288ff 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -814,10 +814,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]);
-        smap_add_format(args, "tos", "%d", ttl);
+        smap_add_format(args, "ttl", "%d", ttl);
     }
 
     if (flags & TNL_F_TOS_INHERIT) {