From: Vlad Yasevich Date: Mon, 9 Feb 2015 14:38:21 +0000 (-0500) Subject: ipv6: Make __ipv6_select_ident static X-Git-Tag: v3.16.72~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbac56343705df2d24e3588a6ef421d386eda7be;p=thirdparty%2Fkernel%2Fstable.git ipv6: Make __ipv6_select_ident static commit 8381eacf5c3b35cf7755f4bc521c4d56d24c1cd9 upstream. Make __ipv6_select_ident() static as it isn't used outside the file. Fixes: 0508c07f5e0c9 (ipv6: Select fragment id during UFO segmentation if not set.) Signed-off-by: Vladislav Yasevich Signed-off-by: David S. Miller Signed-off-by: Ben Hutchings --- diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 209d096c1328c..0ebd9e3208d12 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -688,8 +688,6 @@ 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)); } -u32 __ipv6_select_ident(u32 hashrnd, struct in6_addr *dst, - struct in6_addr *src); void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt); void ipv6_proxy_select_ident(struct sk_buff *skb); diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c index 791e027f11440..9505567a15807 100644 --- a/net/ipv6/output_core.c +++ b/net/ipv6/output_core.c @@ -9,7 +9,8 @@ #include #include -u32 __ipv6_select_ident(u32 hashrnd, struct in6_addr *dst, struct in6_addr *src) +static u32 __ipv6_select_ident(u32 hashrnd, struct in6_addr *dst, + struct in6_addr *src) { u32 hash, id;