datapath: Always include tunnel TTL in serialized Netlink attributes.

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 <[email protected]> Signed-off-by: Jesse Gross <[email protected]>
Milstein · Jul 9, 2013 · aa20ff9 · aa20ff9
1 parent 04b1326
commit aa20ff9
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/datapath/flow.c b/datapath/flow.c
@@ -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))