Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / net / ipv6 / output_core.c

diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
index 56596ce390a19783fa20819aeb5110195fb7d484..ffa029305a094371a2209919bd50a6b82ff7f190 100644 (file)
--- a/net/ipv6/output_core.c
+++ b/net/ipv6/output_core.c
@@ -8,32 +8,6 @@
 #include <net/addrconf.h>
 #include <net/secure_seq.h>
 
-void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
-{
-       static atomic_t ipv6_fragmentation_id;
-       struct in6_addr addr;
-       int ident;
-
-#if IS_ENABLED(CONFIG_IPV6)
-       struct inet_peer *peer;
-       struct net *net;
-
-       net = dev_net(rt->dst.dev);
-       peer = inet_getpeer_v6(net->ipv6.peers, &rt->rt6i_dst.addr, 1);
-       if (peer) {
-               fhdr->identification = htonl(inet_getid(peer, 0));
-               inet_putpeer(peer);
-               return;
-       }
-#endif
-       ident = atomic_inc_return(&ipv6_fragmentation_id);
-
-       addr = rt->rt6i_dst.addr;
-       addr.s6_addr32[0] ^= (__force __be32)ident;
-       fhdr->identification = htonl(secure_ipv6_id(addr.s6_addr32));
-}
-EXPORT_SYMBOL(ipv6_select_ident);
-
 int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr)
 {
        u16 offset = sizeof(struct ipv6hdr);