datapath: Always include tunnel TTL in serialized Netlink attributes.
authorJesse Gross <jesse@nicira.com>
Tue, 9 Jul 2013 23:47:01 +0000 (16:47 -0700)
committerJesse Gross <jesse@nicira.com>
Tue, 9 Jul 2013 23:47:01 +0000 (16:47 -0700)
There is no default value for the tunnel TTL so it must always be
included in flow keys sent from userspace to kernel. The kernel
should also respect this convertion when sending flows to userspace
by always including the TTL in tunnel flows.

CC: Andy Zhou <azhou@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
datapath/flow.c

index 45b85ab..a70b974 100644 (file)
@@ -1289,8 +1289,7 @@ int ipv4_tun_to_nlattr(struct sk_buff *skb,
        if (output->ipv4_tos &&
                nla_put_u8(skb, OVS_TUNNEL_KEY_ATTR_TOS, output->ipv4_tos))
                return -EMSGSIZE;
-       if (output->ipv4_ttl &&
-               nla_put_u8(skb, OVS_TUNNEL_KEY_ATTR_TTL, output->ipv4_ttl))
+       if (nla_put_u8(skb, OVS_TUNNEL_KEY_ATTR_TTL, output->ipv4_ttl))
                return -EMSGSIZE;
        if ((output->tun_flags & TUNNEL_DONT_FRAGMENT) &&
                nla_put_flag(skb, OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT))