From fdc3fc8a6dc7d3f334958fd3af26c315b2e7e99c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jussi=20M=C3=A4ki?= Date: Thu, 6 Aug 2009 21:38:14 +0000 Subject: [PATCH] --- yaml --- r: 156881 b: refs/heads/master c: b79a79471bd31d737c939a6ddc347417047b4320 h: refs/heads/master i: 156879: 231a184dcf132b17738fdf98de5fa3a45fe05afb v: v3 --- [refs] | 2 +- trunk/net/xfrm/xfrm_hash.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4ecdefc6c804..3503e4a72b3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 082ba88a5e6b1425abed3fae4ad65e0e985ed081 +refs/heads/master: b79a79471bd31d737c939a6ddc347417047b4320 diff --git a/trunk/net/xfrm/xfrm_hash.h b/trunk/net/xfrm/xfrm_hash.h index d401dc8f05ed..e5195c99f71e 100644 --- a/trunk/net/xfrm/xfrm_hash.h +++ b/trunk/net/xfrm/xfrm_hash.h @@ -16,7 +16,7 @@ static inline unsigned int __xfrm6_addr_hash(xfrm_address_t *addr) static inline unsigned int __xfrm4_daddr_saddr_hash(xfrm_address_t *daddr, xfrm_address_t *saddr) { - return ntohl(daddr->a4 ^ saddr->a4); + return ntohl(daddr->a4 + saddr->a4); } static inline unsigned int __xfrm6_daddr_saddr_hash(xfrm_address_t *daddr, xfrm_address_t *saddr)