Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / ipv6 / protocol.c

diff --git a/net/ipv6/protocol.c b/net/ipv6/protocol.c
index 9a7978fdc02a5de453feb7c4ca1ea9c1e7652292..053082dfc93e1f9d0c98e26e9c083fc384ed06d5 100644 (file)
--- a/net/ipv6/protocol.c
+++ b/net/ipv6/protocol.c
@@ -29,9 +29,7 @@ const struct inet6_protocol __rcu *inet6_protos[MAX_INET_PROTOS] __read_mostly;
 
 int inet6_add_protocol(const struct inet6_protocol *prot, unsigned char protocol)
 {
-       int hash = protocol & (MAX_INET_PROTOS - 1);
-
-       return !cmpxchg((const struct inet6_protocol **)&inet6_protos[hash],
+       return !cmpxchg((const struct inet6_protocol **)&inet6_protos[protocol],
                        NULL, prot) ? 0 : -1;
 }
 EXPORT_SYMBOL(inet6_add_protocol);
@@ -42,9 +40,9 @@ EXPORT_SYMBOL(inet6_add_protocol);
 
 int inet6_del_protocol(const struct inet6_protocol *prot, unsigned char protocol)
 {
-       int ret, hash = protocol & (MAX_INET_PROTOS - 1);
+       int ret;
 
-       ret = (cmpxchg((const struct inet6_protocol **)&inet6_protos[hash],
+       ret = (cmpxchg((const struct inet6_protocol **)&inet6_protos[protocol],
                       prot, NULL) == prot) ? 0 : -1;
 
        synchronize_net();