From 95155bba19ec0a071f1e7d8b465706e833698405 Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Mon, 8 Oct 2007 00:12:05 -0700 Subject: [PATCH] --- yaml --- r: 65323 b: refs/heads/master c: bf0b48dfc368c07c42b5a3a5658c8ee81b4283ac h: refs/heads/master i: 65321: a95e376b3ff1a5f28abd66739c2b3504576ab41f 65319: 1e3372af7b7ae5063679b42f55598851d24cd6f1 v: v3 --- [refs] | 2 +- trunk/net/ipv6/ndisc.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dd2d557abf00..550455ccce76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf1b803b01b00c3801e0aa373ba0305f8278e260 +refs/heads/master: bf0b48dfc368c07c42b5a3a5658c8ee81b4283ac diff --git a/trunk/net/ipv6/ndisc.c b/trunk/net/ipv6/ndisc.c index 73a894a2152c..5b596659177c 100644 --- a/trunk/net/ipv6/ndisc.c +++ b/trunk/net/ipv6/ndisc.c @@ -1268,9 +1268,10 @@ static void ndisc_redirect_rcv(struct sk_buff *skb) if (ipv6_addr_equal(dest, target)) { on_link = 1; - } else if (!(ipv6_addr_type(target) & IPV6_ADDR_LINKLOCAL)) { + } else if (ipv6_addr_type(target) != + (IPV6_ADDR_UNICAST|IPV6_ADDR_LINKLOCAL)) { ND_PRINTK2(KERN_WARNING - "ICMPv6 Redirect: target address is not link-local.\n"); + "ICMPv6 Redirect: target address is not link-local unicast.\n"); return; } @@ -1344,9 +1345,9 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh, } if (!ipv6_addr_equal(&ipv6_hdr(skb)->daddr, target) && - !(ipv6_addr_type(target) & IPV6_ADDR_LINKLOCAL)) { + ipv6_addr_type(target) != (IPV6_ADDR_UNICAST|IPV6_ADDR_LINKLOCAL)) { ND_PRINTK2(KERN_WARNING - "ICMPv6 Redirect: target address is not link-local.\n"); + "ICMPv6 Redirect: target address is not link-local unicast.\n"); return; }