From patchwork Fri Sep 25 14:39:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 522864 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 BD7FD1402A2 for ; Sat, 26 Sep 2015 00:40:20 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=CF8QzMHM; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932380AbbIYOkN (ORCPT ); Fri, 25 Sep 2015 10:40:13 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:35550 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932113AbbIYOkL (ORCPT ); Fri, 25 Sep 2015 10:40:11 -0400 Received: by pacfv12 with SMTP id fv12so109574443pac.2 for ; Fri, 25 Sep 2015 07:40:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5PB1Bt5aDaswpuKOVhEDmTNR7BUFjpr/WkguTAnMoZI=; b=CF8QzMHMAF/bg4XlG8A4L3M8SvoeDnF6AqW/2DiVXtdoG+4ljjdpdNlZcGDN2ZmHMc n1spv8NUaieNRRM3xibJLgN1MQjvjtDymLt/L0D2ruJvH1bOkhIVI+NyT/3xoJC3Mj1M 42BY+wtQQgeYAqjk4y3QprSVzlnzbjrEAf811JrApqdRadm1G383FzMEIkISoAyxADDM dLhju6K+Kb/adsGTXhnAuHDigNx0+LrcVpnKCW+ZQeJK9sQlCb4tY6ctQNZHQeBPNvoF LKycv221lqueS2DgYqZlDwmA3kT6hwgpzqm3zqlAYiytGxG1qe6l/xYQEskPmhWNC+TB iGJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5PB1Bt5aDaswpuKOVhEDmTNR7BUFjpr/WkguTAnMoZI=; b=a9e4F16QKewBQdSZ+53V0RVs3+mWvbleLYw6F9AlnGR+G3l7FoSanAjK8T5CpG1XYp 9t8ys0fmyLq+QlKVtoz3DIPCVA3aweyYKFvQnC4he8W18Y2edZyJ0+pBJ7MqfURmwbLV dRr/3cmrMvSOgTeQ2x1xkeqNn9rNhu0pQunJGPqokFfEbKGD4zLWoL27dYs7MAy7US30 ex2+vO/g99OyXI5nKXLinupNnpOove/IqgeO62A1xK2tdXm5Vz4SSLVTYfD0WIvWOm99 a7AveBDpMkMyUGilRWzyBlUJousQkTKiEed+9kdovYFbhAkF/2xfuSE0XiYEipHQ32SX EpiQ== X-Gm-Message-State: ALoCoQkFK7McfRvmalPvgaJhmfXH5Ou3A4CTkOtD9q8TPQMDOYkCkeDQ7qU34kphjtv+L3kJnLXk X-Received: by 10.66.65.228 with SMTP id a4mr7746020pat.19.1443192000554; Fri, 25 Sep 2015 07:40:00 -0700 (PDT) Received: from localhost ([2620:0:1000:3002:1cc3:31a2:9afe:27e6]) by smtp.gmail.com with ESMTPSA id df2sm4374185pad.19.2015.09.25.07.39.58 (version=TLS1_2 cipher=AES128-SHA256 bits=128/128); Fri, 25 Sep 2015 07:39:59 -0700 (PDT) From: Eric Dumazet To: "David S . Miller" Cc: netdev , Eric Dumazet , Eric Dumazet Subject: [PATCH net-next 05/17] ipv6: constify ip6_dst_lookup_{flow|tail}() sock arguments Date: Fri, 25 Sep 2015 07:39:12 -0700 Message-Id: <1443191964-923-6-git-send-email-edumazet@google.com> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1443191964-923-1-git-send-email-edumazet@google.com> References: <1443191964-923-1-git-send-email-edumazet@google.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ip6_dst_lookup_flow() and ip6_dst_lookup_tail() do not touch socket, lets add a const qualifier. This will permit the same change in inet6_csk_route_req() Signed-off-by: Eric Dumazet --- include/net/ipv6.h | 2 +- net/ipv6/ip6_output.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 384a93cf07d6..9877b68ad207 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -849,7 +849,7 @@ static inline struct sk_buff *ip6_finish_skb(struct sock *sk) int ip6_dst_lookup(struct net *net, struct sock *sk, struct dst_entry **dst, struct flowi6 *fl6); -struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6, +struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6, const struct in6_addr *final_dst); struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6, const struct in6_addr *final_dst); diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 291a07be5dfb..6b0d86f3fbfc 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -883,7 +883,7 @@ out: return dst; } -static int ip6_dst_lookup_tail(struct net *net, struct sock *sk, +static int ip6_dst_lookup_tail(struct net *net, const struct sock *sk, struct dst_entry **dst, struct flowi6 *fl6) { #ifdef CONFIG_IPV6_OPTIMISTIC_DAD @@ -1014,7 +1014,7 @@ EXPORT_SYMBOL_GPL(ip6_dst_lookup); * It returns a valid dst pointer on success, or a pointer encoded * error code. */ -struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6, +struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6, const struct in6_addr *final_dst) { struct dst_entry *dst = NULL;