From patchwork Sat Feb 16 19:10:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Frederic Sowa X-Patchwork-Id: 221030 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DB5EC2C0082 for ; Sun, 17 Feb 2013 06:10:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754051Ab3BPTK2 (ORCPT ); Sat, 16 Feb 2013 14:10:28 -0500 Received: from order.stressinduktion.org ([87.106.68.36]:39315 "EHLO order.stressinduktion.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754037Ab3BPTKW (ORCPT ); Sat, 16 Feb 2013 14:10:22 -0500 Received: by order.stressinduktion.org (Postfix, from userid 500) id EFD261A0CC9C; Sat, 16 Feb 2013 20:10:21 +0100 (CET) Date: Sat, 16 Feb 2013 20:10:21 +0100 From: Hannes Frederic Sowa To: netdev@vger.kernel.org Cc: yoshfuji@linux-ipv6.org, brian.haley@hp.com Subject: [PATCH net-next v2 4/4] ipv6: stop multicast forwarding to process reserved/interface/link scoped addresses Message-ID: <20130216191021.GA23403@order.stressinduktion.org> Mail-Followup-To: netdev@vger.kernel.org, yoshfuji@linux-ipv6.org, brian.haley@hp.com Mime-Version: 1.0 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org v2: a) unchanged Cc: YOSHIFUJI Hideaki Cc: Brian Haley Signed-off-by: Hannes Frederic Sowa --- net/ipv6/ip6_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index 5b10414..974ba8b 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c @@ -279,7 +279,7 @@ int ip6_mc_input(struct sk_buff *skb) * IPv6 multicast router mode is now supported ;) */ if (dev_net(skb->dev)->ipv6.devconf_all->mc_forwarding && - !(ipv6_addr_type(&hdr->daddr) & IPV6_ADDR_LINKLOCAL) && + !__ipv6_addr_needs_scope_id(__ipv6_addr_props(&hdr->daddr)) && likely(!(IP6CB(skb)->flags & IP6SKB_FORWARDED))) { /* * Okay, we try to forward - split and duplicate