Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

[pandora-kernel.git] / drivers / char / random.c

diff --git a/drivers/char/random.c b/drivers/char/random.c
index d4ddeba..7292819 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1523,6 +1523,21 @@ __u32 secure_ip_id(__be32 daddr)
        return half_md4_transform(hash, keyptr->secret);
 }
 
+__u32 secure_ipv6_id(const __be32 daddr[4])
+{
+       const struct keydata *keyptr;
+       __u32 hash[4];
+
+       keyptr = get_keyptr();
+
+       hash[0] = (__force __u32)daddr[0];
+       hash[1] = (__force __u32)daddr[1];
+       hash[2] = (__force __u32)daddr[2];
+       hash[3] = (__force __u32)daddr[3];
+
+       return half_md4_transform(hash, keyptr->secret);
+}
+
 #ifdef CONFIG_INET
 
 __u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr,