From patchwork Sat Sep 24 16:05:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Maciej_=C5=BBenczykowski?= X-Patchwork-Id: 674317 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 3shFTF299Yz9s9c for ; Sun, 25 Sep 2016 02:06:09 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=LAHE5H4S; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933272AbcIXQGG (ORCPT ); Sat, 24 Sep 2016 12:06:06 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35916 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756082AbcIXQGC (ORCPT ); Sat, 24 Sep 2016 12:06:02 -0400 Received: by mail-pf0-f196.google.com with SMTP id n24so6707065pfb.3 for ; Sat, 24 Sep 2016 09:06:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1nZ2TS8PeqnQIkCyGCmbOVIl/x1k5uvUZDuw2xDsHmc=; b=LAHE5H4SaMnU/n82Gb0RWG/2jGXfHQhnLVzYUZPSL/DpkW6ywEL6iDyWQRWCDlzN6M 0s5MjeWmzfPHUcWiZMX1X7bbe4Uayr2itGoJyVYtU6GOobskNXDF0bhkjPp35KlTysEM 1Hc4HtwuSX4inp/dklW76dCdu0SZlkgz2DlmsSKZvc8L4U7WAkWMrsMvHGJrwhg17CCd 1WVeVHRfH3PQaL2EbpEeFFLMOYhw8gBkyHaUE96p2SoX7XHRUVvJT+e7DryZr2yi1k23 9qYejcy2eRquq5rxbDR3xk73Ln609sWKrzNj8v8if28wAtKZRATnSPpD3lzMBfRtEzUG Holg== 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:mime-version:content-transfer-encoding; bh=1nZ2TS8PeqnQIkCyGCmbOVIl/x1k5uvUZDuw2xDsHmc=; b=ARbucrJqmM6VAxC9apODHwgTqMVxvFLPNw1KxBJfV2R36xtKPlhWkKCRIYJwqKrk0F QYvwVOZxZOmoN6XisflGYU5/VjTV46tTv34/Aa4yXTriIXSKA1Ah7ns/u1qN5/d8Mp+y Y6N3NotV2rWetMTkWOQfq99MBpSa09t/KVX5btuIP7AVgZspY62D1ExGPaauYMLbLftQ r/zGjfO02MeYpeES0Hx4VGUOzju676h5f0Fl5b+EP9qf7NUnFoCiJKN2mihIVT+s9IMO 3VbANL/dabjQFA5xBGn3u2lB82WhmLlXvhDju4PS9ZRoncbk1F3p9q1FirBFAyZ9PBHG d6aw== X-Gm-Message-State: AE9vXwPBuiaId+fkt4yYzk5weHJEhgYjI5lS1WnPvQPNRlH1YGn8FCS2w/mGv5tb6qFlgw== X-Received: by 10.98.31.10 with SMTP id f10mr22957056pff.137.1474733161695; Sat, 24 Sep 2016 09:06:01 -0700 (PDT) Received: from vpbr9.mtv.corp.google.com ([172.24.110.201]) by smtp.gmail.com with ESMTPSA id i62sm19499921pfe.70.2016.09.24.09.06.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 24 Sep 2016 09:06:01 -0700 (PDT) From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= To: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= , "David S . Miller" Cc: netdev@vger.kernel.org, Erik Kline , Lorenzo Colitti Subject: [PATCH 2/7] ipv6 addrconf: remove addrconf_sysctl_hop_limit() Date: Sat, 24 Sep 2016 09:05:04 -0700 Message-Id: <1474733109-18355-2-git-send-email-zenczykowski@gmail.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1474733109-18355-1-git-send-email-zenczykowski@gmail.com> References: <1474733109-18355-1-git-send-email-zenczykowski@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Maciej Żenczykowski replace with extra1/2 magic Signed-off-by: Maciej Żenczykowski --- net/ipv6/addrconf.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 11fa1a5564d4..3a835495fb53 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -5467,20 +5467,6 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write, } static -int addrconf_sysctl_hop_limit(struct ctl_table *ctl, int write, - void __user *buffer, size_t *lenp, loff_t *ppos) -{ - struct ctl_table lctl; - int min_hl = 1, max_hl = 255; - - lctl = *ctl; - lctl.extra1 = &min_hl; - lctl.extra2 = &max_hl; - - return proc_dointvec_minmax(&lctl, write, buffer, lenp, ppos); -} - -static int addrconf_sysctl_mtu(struct ctl_table *ctl, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { @@ -5713,6 +5699,9 @@ int addrconf_sysctl_ignore_routes_with_linkdown(struct ctl_table *ctl, return ret; } +static int one = 1; +static int two_five_five = 255; + static const struct ctl_table addrconf_sysctl[] = { { .procname = "forwarding", @@ -5726,7 +5715,9 @@ static const struct ctl_table addrconf_sysctl[] = { .data = &ipv6_devconf.hop_limit, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = addrconf_sysctl_hop_limit, + .proc_handler = proc_dointvec_minmax, + .extra1 = &one, + .extra2 = &two_five_five, }, { .procname = "mtu",