Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
net
/
batman-adv
/
hash.c
diff --git
a/kernel/net/batman-adv/hash.c
b/kernel/net/batman-adv/hash.c
index
7c1c630
..
2ea6a18
100644
(file)
--- a/
kernel/net/batman-adv/hash.c
+++ b/
kernel/net/batman-adv/hash.c
@@
-1,4
+1,4
@@
-/* Copyright (C) 2006-201
4
B.A.T.M.A.N. contributors:
+/* Copyright (C) 2006-201
5
B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Marek Lindner
*
*
* Simon Wunderlich, Marek Lindner
*
@@
-15,13
+15,17
@@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "main.h"
#include "hash.h"
#include "hash.h"
+#include "main.h"
+
+#include <linux/fs.h>
+#include <linux/lockdep.h>
+#include <linux/slab.h>
/* clears the hash */
static void batadv_hash_init(struct batadv_hashtable *hash)
{
/* clears the hash */
static void batadv_hash_init(struct batadv_hashtable *hash)
{
- u
int32_t
i;
+ u
32
i;
for (i = 0; i < hash->size; i++) {
INIT_HLIST_HEAD(&hash->table[i]);
for (i = 0; i < hash->size; i++) {
INIT_HLIST_HEAD(&hash->table[i]);
@@
-38,7
+42,7
@@
void batadv_hash_destroy(struct batadv_hashtable *hash)
}
/* allocates and clears the hash */
}
/* allocates and clears the hash */
-struct batadv_hashtable *batadv_hash_new(u
int32_t
size)
+struct batadv_hashtable *batadv_hash_new(u
32
size)
{
struct batadv_hashtable *hash;
{
struct batadv_hashtable *hash;
@@
-69,7
+73,7
@@
free_hash:
void batadv_hash_set_lock_class(struct batadv_hashtable *hash,
struct lock_class_key *key)
{
void batadv_hash_set_lock_class(struct batadv_hashtable *hash,
struct lock_class_key *key)
{
- u
int32_t
i;
+ u
32
i;
for (i = 0; i < hash->size; i++)
lockdep_set_class(&hash->list_locks[i], key);
for (i = 0; i < hash->size; i++)
lockdep_set_class(&hash->list_locks[i], key);