From 769b3f7c4c6b71c21e337a2db2312b7aa49c1b57 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Sat, 4 Feb 2006 02:17:55 -0800 Subject: [PATCH] --- yaml --- r: 19829 b: refs/heads/master c: 878c41ce5747e1b417bdd92a694c33dc4bd6ec02 h: refs/heads/master i: 19827: 35f05905815ca07f5adb3c5998050dd21cd88f23 v: v3 --- [refs] | 2 +- trunk/net/ipv6/netfilter/ip6t_policy.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dc44919f8d99..ba7d0ebd5d30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e55f1bc5dcb60a47764f6eabd1501d2cb98fb2c4 +refs/heads/master: 878c41ce5747e1b417bdd92a694c33dc4bd6ec02 diff --git a/trunk/net/ipv6/netfilter/ip6t_policy.c b/trunk/net/ipv6/netfilter/ip6t_policy.c index 9f38cd0a6489..1d0f48276123 100644 --- a/trunk/net/ipv6/netfilter/ip6t_policy.c +++ b/trunk/net/ipv6/netfilter/ip6t_policy.c @@ -26,8 +26,9 @@ MODULE_LICENSE("GPL"); static inline int match_xfrm_state(struct xfrm_state *x, const struct ip6t_policy_elem *e) { -#define MATCH_ADDR(x,y,z) (!e->match.x || \ - ((ip6_masked_addrcmp((z), &e->x, &e->y)) == 0) ^ e->invert.x) +#define MATCH_ADDR(x,y,z) (!e->match.x || \ + ((!ip6_masked_addrcmp(&e->x, &e->y, z)) \ + ^ e->invert.x)) #define MATCH(x,y) (!e->match.x || ((e->x == (y)) ^ e->invert.x)) return MATCH_ADDR(saddr, smask, (struct in6_addr *)&x->props.saddr.a6) &&