X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Ftunnel.c;h=7863b7a35af85cbf26763a5f34ac0fa2e8522a05;hb=0dd17bfdfed067cd15f764a5c741625c4c118ac8;hp=a7d4943781975a1548589aa62412e72d32e50db7;hpb=aae369c706cd56886f8560c43960110f79e062dc;p=openvswitch diff --git a/datapath/tunnel.c b/datapath/tunnel.c index a7d49437..7863b7a3 100644 --- a/datapath/tunnel.c +++ b/datapath/tunnel.c @@ -804,7 +804,7 @@ static void create_tunnel_header(const struct vport *vport, iph->saddr = rt->rt_src; iph->ttl = mutable->ttl; if (!iph->ttl) - iph->ttl = dst_metric(&rt_dst(rt), RTAX_HOPLIMIT); + iph->ttl = ip4_dst_hoplimit(&rt_dst(rt)); tnl_vport->tnl_ops->build_header(vport, mutable, iph + 1); } @@ -1233,7 +1233,7 @@ int tnl_send(struct vport *vport, struct sk_buff *skb) /* TTL */ ttl = mutable->ttl; if (!ttl) - ttl = dst_metric(&rt_dst(rt), RTAX_HOPLIMIT); + ttl = ip4_dst_hoplimit(&rt_dst(rt)); if (mutable->flags & TNL_F_TTL_INHERIT) { if (skb->protocol == htons(ETH_P_IP))