Commit a97d97ba authored Sep 29, 2018 by Hangbin Liu Committed by David S. Miller Oct 04, 2018

geneve: allow to clear ttl inherit



As Michal remaind, we should allow to clear ttl inherit. Then we will
have three states:

1. set the flag, and do ttl inherit.
2. do not set the flag, use configured ttl value, or default ttl (0) if
   not set.
3. disable ttl inherit, use previous configured ttl value, or default ttl (0).

Fixes: 52d0d404 ("geneve: add ttl inherit support")
CC: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 5a781ccb

drivers/net/geneve.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -1325,11 +1325,15 @@ static int geneve_nl2info(struct nlattr tb[], struct nlattr data[],
		info->key.tun_id = tunid;
		}

		if (data[IFLA_GENEVE_TTL])
		info->key.ttl = nla_get_u8(data[IFLA_GENEVE_TTL]);

		if (data[IFLA_GENEVE_TTL_INHERIT])
		if (data[IFLA_GENEVE_TTL_INHERIT]) {
		if (nla_get_u8(data[IFLA_GENEVE_TTL_INHERIT]))
		*ttl_inherit = true;
		else
		*ttl_inherit = false;
		} else if (data[IFLA_GENEVE_TTL]) {
		info->key.ttl = nla_get_u8(data[IFLA_GENEVE_TTL]);
		*ttl_inherit = false;
		}

		if (data[IFLA_GENEVE_TOS])
		info->key.tos = nla_get_u8(data[IFLA_GENEVE_TOS]);

Admin message