Merge tag 'timers-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / net / tipc / core.h

diff --git a/net/tipc/core.h b/net/tipc/core.h
index 1d57a4d..03de7b2 100644 (file)
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2005-2006, 2013-2018 Ericsson AB
  * Copyright (c) 2005-2007, 2010-2013, Wind River Systems
+ * Copyright (c) 2020, Red Hat Inc
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -132,9 +133,6 @@ struct tipc_net {
        spinlock_t nametbl_lock;
        struct name_table *nametbl;
 
-       /* Name dist queue */
-       struct list_head dist_queue;
-
        /* Topology subscription server */
        struct tipc_topsrv *topsrv;
        atomic_t subscription_count;
@@ -213,6 +211,17 @@ static inline u32 tipc_net_hash_mixes(struct net *net, int tn_rand)
        return net_hash_mix(&init_net) ^ net_hash_mix(net) ^ tn_rand;
 }
 
+static inline u32 hash128to32(char *bytes)
+{
+       __be32 *tmp = (__be32 *)bytes;
+       u32 res;
+
+       res = ntohl(tmp[0] ^ tmp[1] ^ tmp[2] ^ tmp[3]);
+       if (likely(res))
+               return res;
+       return  ntohl(tmp[0] | tmp[1] | tmp[2] | tmp[3]);
+}
+
 #ifdef CONFIG_SYSCTL
 int tipc_register_sysctl(void);
 void tipc_unregister_sysctl(void);