ipv6: Use ip6_dst_hoplimit() instead of direct dst_metric() calls.
Subsystems (5)
David Miller
maintainerPATCH 1/1 ipv6: Use ip6_dst_hoplimit() instead of direct dst_metric() calls.
Signed-off-by David S. Miller <[email protected]>
---
I just noticed this while hacking on metrics. IPV6 has to use this special function because the default has a dynamic per-interface value. So it can't do the same trick ipv4 does by pre-seeding the cached route metric.
net/ipv6/netfilter/ip6t_REJECT.c | 2 +- net/ipv6/route.c | 1 + net/ipv6/xfrm6_mode_tunnel.c | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-)
net/ipv6/netfilter/ip6t_REJECT.c +1 -1
@@ -124,7 +124,7 @@ static void send_reset(struct net *net, struct sk_buff *oldskb)skb_reset_network_header (nskb); ip6h =ipv6_hdr (nskb); ip6h->version =6 ; - ip6h->hop_limit =dst_metric (dst,RTAX_HOPLIMIT ); + ip6h->hop_limit =ip6_dst_hoplimit (dst); ip6h->nexthdr =IPPROTO_TCP ;ipv6_addr_copy (&ip6h->saddr, &oip6h->daddr);ipv6_addr_copy (&ip6h->daddr, &oip6h->saddr);
net/ipv6/route.c +1 -0
@@ -1119,6 +1119,7 @@ int ip6_dst_hoplimit(struct dst_entry *dst) }return hoplimit; } +EXPORT_SYMBOL (ip6_dst_hoplimit);/* *
net/ipv6/xfrm6_mode_tunnel.c +2 -1
@@ -14,6 +14,7 @@#include <net/dsfield.h> #include <net/dst.h> #include <net/inet_ecn.h> +#include <net/ip6_route.h> #include <net/ipv6.h> #include <net/xfrm.h>
@@ -53,7 +54,7 @@ static int xfrm6_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)if (x->props.flags &XFRM_STATE_NOECN ) dsfield &= ~INET_ECN_MASK ;ipv6_change_dsfield (top_iph,0 , dsfield); - top_iph->hop_limit =dst_metric (dst->child,RTAX_HOPLIMIT ); + top_iph->hop_limit =ip6_dst_hoplimit (dst->child);ipv6_addr_copy (&top_iph->saddr, (struct in6_addr *)&x->props.saddr);ipv6_addr_copy (&top_iph->daddr, (struct in6_addr *)&x->id.daddr);return 0 ;
Signature · 1 line
1.7.3.2