summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Yasevich <vyasevich@gmail.com>2015-02-09 09:38:21 -0500
committerBen Hutchings <ben@decadent.org.uk>2019-08-13 12:39:30 +0100
commitdbac56343705df2d24e3588a6ef421d386eda7be (patch)
tree73cd160bf397d53be9abfa25d748d141487927a8
parent40abf106876af3fef2aea449d1099cd01c5deb19 (diff)
downloadlinux-stable-dbac56343705df2d24e3588a6ef421d386eda7be.tar.gz
linux-stable-dbac56343705df2d24e3588a6ef421d386eda7be.tar.bz2
linux-stable-dbac56343705df2d24e3588a6ef421d386eda7be.zip
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 <vyasevic@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--include/net/ipv6.h2
-rw-r--r--net/ipv6/output_core.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 209d096c1328..0ebd9e3208d1 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 791e027f1144..9505567a1580 100644
--- a/net/ipv6/output_core.c
+++ b/net/ipv6/output_core.c
@@ -9,7 +9,8 @@
#include <net/addrconf.h>
#include <net/secure_seq.h>
-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;