diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-03-10 06:00:30 -0400 |
---|---|---|
committer | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-03-24 21:24:00 -0400 |
commit | 6b75d0908185bf853b188afa6f269426f6554c5b (patch) | |
tree | 85f28296077f3d873bbda249dc0eafcc911164fd /include | |
parent | 4725474584d6aa2f07b3d47442dfbc4f6544f65e (diff) |
[IPV6]: Optimize hop-limit determination.
Last part of hop-limit determination is always:
hoplimit = dst_metric(dst, RTAX_HOPLIMIT);
if (hoplimit < 0)
hoplimit = ipv6_get_hoplimit(dst->dev).
Let's consolidate it as ip6_dst_hoplimit(dst).
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/addrconf.h | 2 | ||||
-rw-r--r-- | include/net/ip6_route.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h index 232da20e7171..edcb4bbaab7d 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h | |||
@@ -123,8 +123,6 @@ extern int ipv6_is_mld(struct sk_buff *skb, int nexthdr); | |||
123 | 123 | ||
124 | extern void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len); | 124 | extern void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len); |
125 | 125 | ||
126 | extern int ipv6_get_hoplimit(struct net_device *dev); | ||
127 | |||
128 | /* | 126 | /* |
129 | * anycast prototypes (anycast.c) | 127 | * anycast prototypes (anycast.c) |
130 | */ | 128 | */ |
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 0e2895c8b270..5c3b67c86aef 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h | |||
@@ -88,6 +88,8 @@ extern struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev, | |||
88 | const struct in6_addr *addr, | 88 | const struct in6_addr *addr, |
89 | int anycast); | 89 | int anycast); |
90 | 90 | ||
91 | extern int ip6_dst_hoplimit(struct dst_entry *dst); | ||
92 | |||
91 | /* | 93 | /* |
92 | * support functions for ND | 94 | * support functions for ND |
93 | * | 95 | * |