diff options
| author | Cong Wang <amwang@redhat.com> | 2013-08-31 01:44:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-31 22:29:59 -0400 |
| commit | 3ce9b35ff6de8dfebb0b0045e667c000f632e563 (patch) | |
| tree | ecde35b0c857ba52ef90724bf12f037f52ab4957 /include/net | |
| parent | ae5dbf1ad83cb90921a400d15fb18afae66e1e56 (diff) | |
ipv6: move ip6_dst_hoplimit() into core kernel
It will be used by vxlan, and may not be inlined.
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip6_route.h | 2 | ||||
| -rw-r--r-- | include/net/ipv6.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index f667248202b6..f525e7038cca 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h | |||
| @@ -112,8 +112,6 @@ extern struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev, | |||
| 112 | const struct in6_addr *addr, | 112 | const struct in6_addr *addr, |
| 113 | bool anycast); | 113 | bool anycast); |
| 114 | 114 | ||
| 115 | extern int ip6_dst_hoplimit(struct dst_entry *dst); | ||
| 116 | |||
| 117 | /* | 115 | /* |
| 118 | * support functions for ND | 116 | * support functions for ND |
| 119 | * | 117 | * |
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 7bdff0455065..bbf1c8fb8511 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
| @@ -658,6 +658,8 @@ static inline int ipv6_addr_diff(const struct in6_addr *a1, const struct in6_add | |||
| 658 | 658 | ||
| 659 | extern void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt); | 659 | extern void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt); |
| 660 | 660 | ||
| 661 | extern int ip6_dst_hoplimit(struct dst_entry *dst); | ||
| 662 | |||
| 661 | /* | 663 | /* |
| 662 | * Header manipulation | 664 | * Header manipulation |
| 663 | */ | 665 | */ |
