From 8ac841318a4833ba829c9a4bf9ac66b64c37c24e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?= =?UTF-8?q?=E6=98=8E?= Date: Sat, 26 Jan 2013 08:38:44 +0000 Subject: [PATCH] --- yaml --- r: 349746 b: refs/heads/master c: d4c38fa87d2b05be5daafb6a92b6ad15b66da8cb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv6/netfilter/ip6t_NPT.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 112ce331b7c5..2ae18aa54572 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5271fff56c76e92fde122bcc02f102e99da5c8a +refs/heads/master: d4c38fa87d2b05be5daafb6a92b6ad15b66da8cb diff --git a/trunk/net/ipv6/netfilter/ip6t_NPT.c b/trunk/net/ipv6/netfilter/ip6t_NPT.c index 68788c84aee7..87b759c11da5 100644 --- a/trunk/net/ipv6/netfilter/ip6t_NPT.c +++ b/trunk/net/ipv6/netfilter/ip6t_NPT.c @@ -51,7 +51,7 @@ static bool ip6t_npt_map_pfx(const struct ip6t_npt_tginfo *npt, idx = i / 32; addr->s6_addr32[idx] &= mask; - addr->s6_addr32[idx] |= npt->dst_pfx.in6.s6_addr32[idx]; + addr->s6_addr32[idx] |= ~mask & npt->dst_pfx.in6.s6_addr32[idx]; } if (pfx_len <= 48)