diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-11-16 13:31:17 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-11-16 13:31:17 +0300 |
| commit | f108c898ddae4bb1146ed9e46ce4470725d945c4 (patch) | |
| tree | bb887907e0448d4d903f853c33b3c55a863412e2 /include/net/ipv6.h | |
| parent | 904cb3677f3adcd3d837be0a0d0b14251ba8d6f7 (diff) | |
| parent | 68055915c1c22489f9658bd2b7391bb11b2cf4e4 (diff) | |
| download | linux-f108c898ddae4bb1146ed9e46ce4470725d945c4.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/ipv6.h')
| -rw-r--r-- | include/net/ipv6.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 97f472012438..4292929392b0 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -671,6 +671,8 @@ static inline int ipv6_addr_diff(const struct in6_addr *a1, const struct in6_add return __ipv6_addr_diff(a1, a2, sizeof(struct in6_addr)); } +void ipv6_proxy_select_ident(struct sk_buff *skb); + int ip6_dst_hoplimit(struct dst_entry *dst); static inline int ip6_sk_dst_hoplimit(struct ipv6_pinfo *np, struct flowi6 *fl6, |