From patchwork Tue Mar 12 21:21:36 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: 227115 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 55EB22C0DC3 for ; Wed, 13 Mar 2013 08:21:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755645Ab3CLVVi (ORCPT ); Tue, 12 Mar 2013 17:21:38 -0400 Received: from order.stressinduktion.org ([87.106.68.36]:59695 "EHLO order.stressinduktion.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755391Ab3CLVVh (ORCPT ); Tue, 12 Mar 2013 17:21:37 -0400 Received: by order.stressinduktion.org (Postfix, from userid 500) id B4C0F1A0C4EC; Tue, 12 Mar 2013 22:21:36 +0100 (CET) Date: Tue, 12 Mar 2013 22:21:36 +0100 From: Hannes Frederic Sowa To: netfilter-devel@vger.kernel.org Cc: yoshfuji@linux-ipv6.org, netdev@vger.kernel.org, pablo@netfilter.org Subject: [PATCH net-next] ipv6: use ipv6_iface_scope_id in conntrack to return scope id Message-ID: <20130312212136.GB14801@order.stressinduktion.org> Mail-Followup-To: netfilter-devel@vger.kernel.org, yoshfuji@linux-ipv6.org, netdev@vger.kernel.org, pablo@netfilter.org Mime-Version: 1.0 Content-Disposition: inline Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Cc: YOSHIFUJI Hideaki Signed-off-by: Hannes Frederic Sowa --- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c index 2b6c226..97bcf2b 100644 --- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c @@ -330,12 +330,8 @@ ipv6_getorigdst(struct sock *sk, int optval, void __user *user, int *len) sizeof(sin6.sin6_addr)); nf_ct_put(ct); - - if (ipv6_addr_type(&sin6.sin6_addr) & IPV6_ADDR_LINKLOCAL) - sin6.sin6_scope_id = sk->sk_bound_dev_if; - else - sin6.sin6_scope_id = 0; - + sin6.sin6_scope_id = ipv6_iface_scope_id(&sin6.sin6_addr, + sk->sk_bound_dev_if); return copy_to_user(user, &sin6, sizeof(sin6)) ? -EFAULT : 0; }