diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-26 14:26:24 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-26 14:26:24 -0500 |
| commit | d6f03f29f7cdf064289f941bf0b838348e996e65 (patch) | |
| tree | f8e75089e5690d27c271ca382f25a3386db76f14 /net/batman-adv/originator.h | |
| parent | 6f39da2c5eab64921f92a9ff4a48f3d14a8db24c (diff) | |
| parent | 76e8d7b0d1b0091929e8cd18551a87b6bb6ef2c1 (diff) | |
Merge branch 'for_david' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net/batman-adv/originator.h')
| -rw-r--r-- | net/batman-adv/originator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index cfc1f60a96a..67765ffef73 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@ -42,7 +42,7 @@ int orig_hash_del_if(struct hard_iface *hard_iface, int max_if_num); /* hashfunction to choose an entry in a hash table of given size */ /* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */ -static inline int choose_orig(const void *data, int32_t size) +static inline uint32_t choose_orig(const void *data, uint32_t size) { const unsigned char *key = data; uint32_t hash = 0; |