ipv6: Make __ipv6_select_ident static [Linux 3.16.72]

This Linux kernel change "ipv6: Make __ipv6_select_ident static" is included in the Linux 3.16.72 release. This change is authored by Vlad Yasevich <vyasevich [at] gmail.com> on Mon Feb 9 09:38:21 2015 -0500. The commit for this change in Linux stable tree is dbac563 (patch) which is from upstream commit 8381eac. The same Linux upstream change may have been applied to various maintained Linux releases and you can find all Linux releases containing changes from upstream 8381eac.

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>

There are 5 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 include/net/ipv6.h     | 2 --
 net/ipv6/output_core.c | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 209d096..0ebd9e3 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 791e027..9505567 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;

Leave a Reply

Your email address will not be published. Required fields are marked *