From patchwork Sat Nov 4 15:53:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 834204 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iApj6GgN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yTjzK0p39z9sP1 for ; Sun, 5 Nov 2017 02:53:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932325AbdKDPxa (ORCPT ); Sat, 4 Nov 2017 11:53:30 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:44968 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751732AbdKDPx3 (ORCPT ); Sat, 4 Nov 2017 11:53:29 -0400 Received: by mail-pg0-f66.google.com with SMTP id j3so4926801pga.1 for ; Sat, 04 Nov 2017 08:53:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:subject:from:to:cc:date:mime-version :content-transfer-encoding; bh=zxy02WoJKCfFoE1B+F81U4+hmuJAfm7OYKAUf8D8PcE=; b=iApj6GgNZ1gxDKIByndVTobXWqhytZJhUzG2nVXZq1yXHmJ9LCJw1ayRynIyPs0QoH rbCT5tXBS3qeB+MsylzxImYevHLxrlsS1mEDQkZjjkUw3gtjZJK1COGJnT6sOS8CiotU 234mf3OclTSBDBJSsw/EBc/GUV2iXYR2jM6ovDDitcQdkgC09Ex9U6Z7OyJIKtg0K7PY iKRwyXzmfiZuXnlBeyIdOObjgUFOjJR/VDiPM+k9lMlBqeW7VfTWNdXXgpt5L0RtqBtX jOaxXVYSlpVTseB4gVIq3dfGC6BCRRB2gthtDlfDxTcXXYn+SkP1bvW1Ulbb/xUldJVc JT9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:mime-version :content-transfer-encoding; bh=zxy02WoJKCfFoE1B+F81U4+hmuJAfm7OYKAUf8D8PcE=; b=R48iTolEWVoi1mLt4/5sMLbgA5WuGJ26IvtTNvrmTPLZp+sKN/136c+4/uW108x0rp 7/iOn7Q9qDxen/RPzAvBocFXjh4V7peDMA18D2N9BQvz5GA/iGlD/wQxONSW6f7rvJWP CfVM5GrJm/ZltdWkuo3LsVo/tGpYAVGKxa4llb+ilijwIGSNkQbfnlOqBminQKP2e8xR KlXNlylMCnefnqk4MqkAv7/62hscG7okuQM/fHNmMF+EPOLvSDw+InksLILREv7Nzejv sTqe5uV3914Sfo8F6zlQ/3/5aEYuaTLcP63Ek+HhD+10YjiOWrfPsW3X72wmBBUy7jR3 S3eQ== X-Gm-Message-State: AMCzsaXTeQEtOMsSiM+RjaauR1DAQDDZljUTUdwKxtls0bo2z5pTeK/9 M2vXFDubKnWbSeeqYJax5oT6Fw== X-Google-Smtp-Source: ABhQp+Sy2ETaZm+QsRyU7tpND+FavMusMQHR2CXMAh8+A1FmhVAZ+yYx7TulwGqNfwzIuuL14lHztQ== X-Received: by 10.99.129.199 with SMTP id t190mr10499431pgd.227.1509810809417; Sat, 04 Nov 2017 08:53:29 -0700 (PDT) Received: from [192.168.86.171] (c-67-180-167-114.hsd1.ca.comcast.net. [67.180.167.114]) by smtp.googlemail.com with ESMTPSA id b9sm15666481pff.48.2017.11.04.08.53.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Nov 2017 08:53:28 -0700 (PDT) Message-ID: <1509810807.2849.76.camel@edumazet-glaptop3.roam.corp.google.com> Subject: [PATCH net-next] ipv6: remove IN6_ADDR_HSIZE from addrconf.h From: Eric Dumazet To: David Miller Cc: netdev Date: Sat, 04 Nov 2017 08:53:27 -0700 X-Mailer: Evolution 3.10.4-0ubuntu2 Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eric Dumazet IN6_ADDR_HSIZE is private to addrconf.c, move it here to avoid confusion. Signed-off-by: Eric Dumazet Acked-by: David Ahern --- Should be applied after pktgen fix, thanks ! include/net/addrconf.h | 3 --- net/ipv6/addrconf.c | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/net/addrconf.h b/include/net/addrconf.h index 3357332ea375b53dfb7704ea5eb8274a904f59b8..b623b65a79d1687602ba319cf9047a4c41b6396b 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h @@ -59,9 +59,6 @@ struct in6_validator_info { struct netlink_ext_ack *extack; }; -#define IN6_ADDR_HSIZE_SHIFT 8 -#define IN6_ADDR_HSIZE (1 << IN6_ADDR_HSIZE_SHIFT) - int addrconf_init(void); void addrconf_cleanup(void); diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 69b8cdb43aa2a7289b9133a4fcad3da5d148a7fb..66d8c3d912fdb3de8d1bc157e8e7fe3750fd9005 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -157,6 +157,8 @@ static int ipv6_generate_stable_address(struct in6_addr *addr, u8 dad_count, const struct inet6_dev *idev); +#define IN6_ADDR_HSIZE_SHIFT 8 +#define IN6_ADDR_HSIZE (1 << IN6_ADDR_HSIZE_SHIFT) /* * Configured unicast address hash table */