Merge tag 'jfs-for-4.20' of git://github.com/kleikamp/linux-shaggy

[linux.git] / drivers / net / geneve.c

diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 6625fabe2c8870379565c03f99edabb2b857b66e..a0cd1c41cf5f07255283be656f1ecf074417532a 100644 (file)
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -831,12 +831,8 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev,
        if (IS_ERR(rt))
                return PTR_ERR(rt);
 
-       if (skb_dst(skb)) {
-               int mtu = dst_mtu(&rt->dst) - GENEVE_IPV4_HLEN -
-                         info->options_len;
-
-               skb_dst_update_pmtu(skb, mtu);
-       }
+       skb_tunnel_check_pmtu(skb, &rt->dst,
+                             GENEVE_IPV4_HLEN + info->options_len);
 
        sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);
        if (geneve->collect_md) {
@@ -881,11 +877,7 @@ static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
        if (IS_ERR(dst))
                return PTR_ERR(dst);
 
-       if (skb_dst(skb)) {
-               int mtu = dst_mtu(dst) - GENEVE_IPV6_HLEN - info->options_len;
-
-               skb_dst_update_pmtu(skb, mtu);
-       }
+       skb_tunnel_check_pmtu(skb, dst, GENEVE_IPV6_HLEN + info->options_len);
 
        sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);
        if (geneve->collect_md) {
@@ -1325,11 +1317,15 @@ static int geneve_nl2info(struct nlattr *tb[], struct nlattr *data[],
                info->key.tun_id = tunid;
        }
 
-       if (data[IFLA_GENEVE_TTL])
+       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]);
-
-       if (data[IFLA_GENEVE_TTL_INHERIT])
-               *ttl_inherit = true;
+               *ttl_inherit = false;
+       }
 
        if (data[IFLA_GENEVE_TOS])
                info->key.tos = nla_get_u8(data[IFLA_GENEVE_TOS]);