From: Corey Mutter Date: Mon, 14 May 2007 10:00:27 +0000 (-0700) Subject: [IPV6]: Reverse sense of promisc tests in ip6_mc_input X-Git-Tag: v2.6.22-rc2~110^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae7bf20a6316272acfcaef5d265b18aaa54b41e4;p=platform%2Fupstream%2Fkernel-adaptation-pc.git [IPV6]: Reverse sense of promisc tests in ip6_mc_input Reverse the sense of the promiscuous-mode tests in ip6_mc_input(). Signed-off-by: Corey Mutter Signed-off-by: David L Stevens Signed-off-by: David S. Miller --- diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index be0ee8a..30a5cb1 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c @@ -235,7 +235,7 @@ int ip6_mc_input(struct sk_buff *skb) IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_INMCASTPKTS); hdr = ipv6_hdr(skb); - deliver = likely(!(skb->dev->flags & (IFF_PROMISC|IFF_ALLMULTI))) || + deliver = unlikely(skb->dev->flags & (IFF_PROMISC|IFF_ALLMULTI)) || ipv6_chk_mcast_addr(skb->dev, &hdr->daddr, NULL); /*