Revision 04632fd7 nest/rt-attr.c

View differences:

nest/rt-attr.c
195 195
 *	Multipath Next Hop
196 196
 */
197 197

  
198
static inline uint
198
static inline u32
199 199
mpnh_hash(struct mpnh *x)
200 200
{
201
  uint h = 0;
201
  u32 h = 0;
202 202
  for (; x; x = x->next)
203 203
    h ^= ipa_hash(x->gw);
204 204

  
......
1008 1008
static inline uint
1009 1009
rta_hash(rta *a)
1010 1010
{
1011
  return (((uint) (uintptr_t) a->src) ^ ipa_hash(a->gw) ^
1012
	  mpnh_hash(a->nexthops) ^ ea_hash(a->eattrs)) & 0xffff;
1011
  /* XXXX fully convert to u32 hashing */
1012
  return (((uint) (uintptr_t) a->src) ^ (ipa_hash(a->gw) >> 16) ^
1013
	  (mpnh_hash(a->nexthops) >> 16) ^ ea_hash(a->eattrs)) & 0xffff;
1013 1014
}
1014 1015

  
1015 1016
static inline int

Also available in: Unified diff