diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-12 23:30:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-12 23:30:45 -0700 |
| commit | bf47f4b0babe287f250dd720b41ecad9b8f7ac9b (patch) | |
| tree | 0829ef3bff455f98155b5cb0e91b71db36de3510 /net/ipv6/ip6_output.c | |
| parent | 0b9715e64f7d46a9620d4d5042a5e28f5595ed54 (diff) | |
| parent | 5b285cac3570a935aaa28312c1ea28f9e01c5452 (diff) | |
| download | linux-bf47f4b0babe287f250dd720b41ecad9b8f7ac9b.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 5173acaeb501..cd963f64e27c 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -108,7 +108,7 @@ static int ip6_finish_output2(struct sk_buff *skb) struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb)); if (!(dev->flags & IFF_LOOPBACK) && sk_mc_loop(skb->sk) && - ((mroute6_socket(dev_net(dev)) && + ((mroute6_socket(dev_net(dev), skb) && !(IP6CB(skb)->flags & IP6SKB_FORWARDED)) || ipv6_chk_mcast_addr(dev, &ipv6_hdr(skb)->daddr, &ipv6_hdr(skb)->saddr))) { |